diff options
| author | Günther Deschner <gd@samba.org> | 2011-11-02 20:07:42 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-11-03 18:35:08 +0100 |
| commit | 2ecd50116c22536f9a77131bc14a64915a2fc12e (patch) | |
| tree | 2f245dcc73fdd086367e325ebb2e7f4f3b427678 /librpc | |
| parent | e426f37b64ea76e0dda19ec06b6da69f0822d599 (diff) | |
| download | samba-2ecd50116c22536f9a77131bc14a64915a2fc12e.tar.gz samba-2ecd50116c22536f9a77131bc14a64915a2fc12e.tar.bz2 samba-2ecd50116c22536f9a77131bc14a64915a2fc12e.zip | |
librpc: remove nbt dependency to samr.
Guenther
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/idl/misc.idl | 7 | ||||
| -rw-r--r-- | librpc/idl/nbt.idl | 9 | ||||
| -rw-r--r-- | librpc/idl/samr.idl | 7 |
3 files changed, 10 insertions, 13 deletions
diff --git a/librpc/idl/misc.idl b/librpc/idl/misc.idl index d37e515a31..4d6fe3019a 100644 --- a/librpc/idl/misc.idl +++ b/librpc/idl/misc.idl @@ -77,4 +77,11 @@ interface misc [case(REG_MULTI_SZ)] nstring_array string_array; [default,flag(NDR_REMAINING)] DATA_BLOB data; } winreg_Data; + + /* SAM database types */ + typedef [public,v1_enum] enum { + SAM_DATABASE_DOMAIN = 0, /* Domain users and groups */ + SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */ + SAM_DATABASE_PRIVS = 2 /* Privileges */ + } netr_SamDatabaseID; } diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl index 5d8dfd7088..eb2e8117ed 100644 --- a/librpc/idl/nbt.idl +++ b/librpc/idl/nbt.idl @@ -8,7 +8,7 @@ encoding if it doesn't work out */ -import "misc.idl", "security.idl", "svcctl.idl", "samr.idl"; +import "misc.idl", "security.idl", "svcctl.idl"; [ helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h"), helpstring("NBT messages"), @@ -393,8 +393,6 @@ interface nbt LOGON_SAM_LOGON_USER_UNKNOWN_EX = 25 /* was NETLOGON_RESPONSE_FROM_PDC_USER */ } netlogon_command; - typedef bitmap samr_AcctFlags samr_AcctFlags; - /* query to dc hand marshaled, as it has 'optional' * parts */ typedef [nopull,nopush] struct { @@ -402,7 +400,8 @@ interface nbt nstring computer_name; nstring user_name; astring mailslot_name; - samr_AcctFlags acct_control; + uint32 acct_control; + /* samr_AcctFlags acct_control; */ [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size; /* The manual alignment is required because this * structure is marked flag(NDR_NOALIGN) via the @@ -511,8 +510,6 @@ interface nbt uint16 lm20_token; } nbt_netlogon_response2; - typedef enum netr_SamDatabaseID netr_SamDatabaseID; - /* used to announce SAM changes - MS-NRPC 2.2.1.5.1 */ typedef struct { netr_SamDatabaseID db_index; diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl index cafffc2ca1..4113a5432d 100644 --- a/librpc/idl/samr.idl +++ b/librpc/idl/samr.idl @@ -17,13 +17,6 @@ import "misc.idl", "lsa.idl", "security.idl"; { typedef bitmap security_secinfo security_secinfo; - /* SAM database types */ - typedef [public,v1_enum] enum { - SAM_DATABASE_DOMAIN = 0, /* Domain users and groups */ - SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */ - SAM_DATABASE_PRIVS = 2 /* Privileges */ - } netr_SamDatabaseID; - /* account control (acct_flags) bits */ typedef [public,bitmap32bit] bitmap { ACB_DISABLED = 0x00000001, /* 1 = User account disabled */ |