← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/samba/oneiric-security

« back to all changes in this revision

Viewing changes to librpc/gen_ndr/nbt.h

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-03-02 16:05:41 UTC
  • Revision ID: james.westby@ubuntu.com-20110302160541-oi1y7yhqn9qe2phs
Tags: 2:3.5.6~dfsg-5ubuntu3
https://launchpad.net/bugs/674216
https://launchpad.net/bugs/652065
* debian/patches/fix-windows7-print-connection.patch: Fix
  error "0x000003e6" when trying to connect a Windows 7 printer
  to a domain. (LP: #674216)
* debian/samba-common.dhcp: Take in account of the upstart script.
  (LP: #652065)

Show diffs side-by-side

added added

removed removed

Lines of Context:
librpc/gen_ndr/nbt.h
456
456
 
457
457
struct NETLOGON_SAM_LOGON_REQUEST {
458
458
        uint16_t request_count;
459
 
        const char * computer_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
460
 
        const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
 
459
        const char * computer_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
 
460
        const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
461
461
        const char * mailslot_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
462
462
        uint32_t acct_control;
463
463
        uint32_t sid_size;/* [value(ndr_size_dom_sid0(&sid,ndr->flags))] */
470
470
 
471
471
struct NETLOGON_SAM_LOGON_RESPONSE_NT40 {
472
472
        enum netlogon_command command;
473
 
        const char * server;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
474
 
        const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
475
 
        const char * domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
 
473
        const char * server;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
 
474
        const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
 
475
        const char * domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
476
476
        uint32_t nt_version;
477
477
        uint16_t lmnt_token;
478
478
        uint16_t lm20_token;
480
480
 
481
481
struct NETLOGON_SAM_LOGON_RESPONSE {
482
482
        enum netlogon_command command;
483
 
        const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
484
 
        const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
485
 
        const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
 
483
        const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
 
484
        const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
 
485
        const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
486
486
        struct GUID domain_uuid;
487
487
        struct GUID zero_uuid;
488
488
        const char * forest;
520
520
        const char * computer_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
521
521
        const char * mailslot_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
522
522
        DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN2)] */
523
 
        const char * unicode_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
 
523
        const char * unicode_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
524
524
        uint32_t nt_version;
525
525
        uint16_t lmnt_token;
526
526
        uint16_t lm20_token;
530
530
        enum netlogon_command command;
531
531
        const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
532
532
        DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN2)] */
533
 
        const char * unicode_pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
534
 
        const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
 
533
        const char * unicode_pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
 
534
        const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
535
535
        uint32_t nt_version;
536
536
        uint16_t lmnt_token;
537
537
        uint16_t lm20_token;
551
551
        const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
552
552
        const char * domain;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
553
553
        DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN2)] */
554
 
        const char * unicode_pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
555
 
        const char * unicode_domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
 
554
        const char * unicode_pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
 
555
        const char * unicode_domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
556
556
        uint32_t db_count;
557
557
        struct nbt_db_change_info *dbchange;
558
558
        uint32_t sid_size;/* [value(ndr_size_dom_sid0(&sid,ndr->flags))] */