← Back to branch summary

~veger/ubuntu/precise/samba/fix-for-902339

« back to all changes in this revision

Viewing changes to librpc/idl/nbt.idl

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are 
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module 
  + Dropped:
    - debian/patches/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
librpc/idl/nbt.idl
10
10
 
11
11
import "misc.idl", "security.idl", "svcctl.idl", "samr.idl";
12
12
[
13
 
        helper("../libcli/netlogon.h", "../libcli/nbt/libnbt.h")
 
13
        helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h"),
 
14
        helpstring("NBT messages"),
 
15
        uuid("6def41b6-86e4-4c32-997c-ed33af7bcd8e")
14
16
]
15
17
interface nbt
16
18
{
23
25
                NBT_FLAG_RECURSION_AVAIL    = 0x0080,
24
26
                NBT_FLAG_RECURSION_DESIRED  = 0x0100,
25
27
                NBT_FLAG_TRUNCATION         = 0x0200,
26
 
                NBT_FLAG_AUTHORITIVE        = 0x0400,
 
28
                NBT_FLAG_AUTHORITATIVE      = 0x0400,
27
29
                NBT_OPCODE                  = 0x7800,
28
30
                NBT_FLAG_REPLY              = 0x8000
29
31
        } nbt_operation;
357
359
                NBT_SERVER_NDNC                         = 0x00000400,
358
360
                NBT_SERVER_SELECT_SECRET_DOMAIN_6       = 0x00000800,
359
361
                NBT_SERVER_FULL_SECRET_DOMAIN_6         = 0x00001000,
360
 
                NBT_SERVER_DNS_FOREST                   = 0x01000000
 
362
                NBT_SERVER_ADS_WEB_SERVICE              = 0x00002000,
 
363
                NBT_SERVER_HAS_DNS_NAME                 = 0x20000000,
 
364
                NBT_SERVER_IS_DEFAULT_NC                = 0x40000000,
 
365
                NBT_SERVER_FOREST_ROOT                  = 0x80000000
361
366
        } nbt_server_type;
362
367
 
363
368
        typedef [bitmap32bit,public] bitmap {
366
371
                NETLOGON_NT_VERSION_5EX                 = 0x00000004,
367
372
                NETLOGON_NT_VERSION_5EX_WITH_IP         = 0x00000008,
368
373
                NETLOGON_NT_VERSION_WITH_CLOSEST_SITE   = 0x00000010,
369
 
                NETLOGON_NT_VERSION_AVIOD_NT4EMUL       = 0x01000000,
 
374
                NETLOGON_NT_VERSION_AVOID_NT4EMUL       = 0x01000000,
370
375
                NETLOGON_NT_VERSION_PDC                 = 0x10000000,
371
376
                NETLOGON_NT_VERSION_IP                  = 0x20000000,
372
377
                NETLOGON_NT_VERSION_LOCAL               = 0x40000000,
374
379
        } netlogon_nt_version_flags;
375
380
 
376
381
        typedef [enum16bit,public] enum {
 
382
                LOGON_REQUEST                     = 0,
 
383
                LOGON_RESPONSE2                   = 6,
377
384
                LOGON_PRIMARY_QUERY               = 7,  /* Was also NETLOGON_QUERY_FOR_PDC */
378
385
                NETLOGON_ANNOUNCE_UAS             = 10,
379
386
                NETLOGON_RESPONSE_FROM_PDC        = 12,
410
417
                uint16               lm20_token;
411
418
        } NETLOGON_SAM_LOGON_REQUEST;
412
419
 
 
420
        typedef struct {
 
421
                astring              computer_name;
 
422
                astring              user_name;
 
423
                astring              mailslot_name;
 
424
                uint8                request_count;
 
425
                uint16               lmnt_token;
 
426
                uint16               lm20_token;
 
427
        } NETLOGON_LOGON_REQUEST;
 
428
 
413
429
        typedef [flag(NDR_NOALIGN),public] struct {
414
430
                netlogon_command command;
415
 
                nstring              server;
 
431
                nstring              pdc_name;
416
432
                nstring              user_name;
417
 
                nstring              domain;
 
433
                nstring              domain_name;
418
434
                netlogon_nt_version_flags               nt_version;
419
435
                uint16               lmnt_token;
420
436
                uint16               lm20_token;
448
464
                nbt_string           forest;
449
465
                nbt_string           dns_domain;
450
466
                nbt_string           pdc_dns_name;
451
 
                nbt_string           domain;
 
467
                nbt_string           domain_name;
452
468
                nbt_string           pdc_name;
453
469
                nbt_string           user_name;
454
470
                nbt_string           server_site;
455
471
                nbt_string           client_site;
456
472
 
457
473
                /* Optional on NETLOGON_NT_VERSION_5EX_WITH_IP */
458
 
                [value(ndr_size_nbt_sockaddr(&sockaddr, ndr->iconv_convenience, ndr->flags))] uint8 sockaddr_size;
 
474
                [value(ndr_size_nbt_sockaddr(&sockaddr, ndr->flags))] uint8 sockaddr_size;
459
475
                [subcontext(0),subcontext_size(sockaddr_size)] nbt_sockaddr sockaddr;
460
476
 
461
477
                /* Optional on NETLOGON_NT_VERSION_WITH_CLOSEST_SITE */
478
494
        } nbt_netlogon_query_for_pdc;
479
495
 
480
496
        /* response from pdc */
481
 
        typedef [flag(NDR_NOALIGN),public] struct {
 
497
        typedef [public] struct {
482
498
                netlogon_command command;
483
499
                astring pdc_name;
484
500
                [flag(NDR_ALIGN2)]   DATA_BLOB _pad;
489
505
                uint16               lm20_token;
490
506
        } nbt_netlogon_response_from_pdc;
491
507
 
 
508
        typedef [flag(NDR_NOALIGN),public] struct {
 
509
                netlogon_command command;
 
510
                astring pdc_name;
 
511
                uint16 lm20_token;
 
512
        } nbt_netlogon_response2;
 
513
 
492
514
        typedef enum netr_SamDatabaseID netr_SamDatabaseID;
493
515
 
494
516
        /* used to announce SAM changes - MS-NRPC 2.2.1.5.1 */
517
539
        } NETLOGON_DB_CHANGE;
518
540
 
519
541
        typedef [nodiscriminant] union {
 
542
                [case(LOGON_REQUEST)]  NETLOGON_LOGON_REQUEST logon0;
520
543
                [case(LOGON_SAM_LOGON_REQUEST)]       NETLOGON_SAM_LOGON_REQUEST logon;
521
544
                [case(LOGON_PRIMARY_QUERY)] nbt_netlogon_query_for_pdc pdc;
522
545
                [case(NETLOGON_ANNOUNCE_UAS)] NETLOGON_DB_CHANGE uas;
539
562
                [switch_is(command)] nbt_netlogon_request req;
540
563
        } nbt_netlogon_packet;
541
564
 
 
565
        void decode_nbt_netlogon_packet(
 
566
                [in] nbt_netlogon_packet packet
 
567
                );
 
568
 
542
569
        /********************************************************/
543
570
        /* \MAILSLOT\BROWSE mailslot requests                   */
544
571
        /* for details see http://ubiqx.org/cifs/Browsing.html  */