The branch, master has been updated
via de54bac54c8276427d88f616e430d2cd486a0ca6 (commit)
via 0950cce83db06b456d6d89e49766c725b09fe2cd (commit)
via d62bc0e8458b7d952159851a9ffa9f6c580acd50 (commit)
from 1147d05b47dc3ff9b985555bb985f7b5117237c8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit de54bac54c8276427d88f616e430d2cd486a0ca6
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 23 21:08:25 2008 +0200
s3: fix NETLOGON_NT_VERSION version flags.
Guenther
commit 0950cce83db06b456d6d89e49766c725b09fe2cd
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 23 21:07:56 2008 +0200
s3: re-run make samba3-idl.
Guenther
commit d62bc0e8458b7d952159851a9ffa9f6c580acd50
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 23 22:35:16 2008 +0200
s3-nbt: start merging from samba4 idl.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/libads/cldap.c | 20 ++++++++++----------
source3/librpc/gen_ndr/nbt.h | 20 ++++++++++----------
source3/librpc/gen_ndr/ndr_nbt.c | 20 ++++++++++----------
source3/librpc/idl/nbt.idl | 20 ++++++++++----------
source3/libsmb/dsgetdcname.c | 20 ++++++++++----------
source3/winbindd/winbindd_cm.c | 2 +-
6 files changed, 51 insertions(+), 51 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c
index 73b28b5..b89d285 100644
--- a/source3/libads/cldap.c
+++ b/source3/libads/cldap.c
@@ -264,7 +264,7 @@ bool ads_cldap_netlogon_5(TALLOC_CTX *mem_ctx,
const char *realm,
struct nbt_cldap_netlogon_5 *reply5)
{
- uint32_t nt_version = NETLOGON_VERSION_5 | NETLOGON_VERSION_5EX;
+ uint32_t nt_version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX;
union nbt_cldap_netlogon *reply = NULL;
bool ret;
@@ -273,7 +273,7 @@ bool ads_cldap_netlogon_5(TALLOC_CTX *mem_ctx,
return false;
}
- if (nt_version != (NETLOGON_VERSION_5 | NETLOGON_VERSION_5EX)) {
+ if (nt_version != (NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX)) {
return false;
}
@@ -322,32 +322,32 @@ bool pull_mailslot_cldap_reply(TALLOC_CTX *mem_ctx,
* was able to reply to, we are fine and all done. otherwise we need to
* assume downgraded replies which are painfully parsed here - gd */
- if (nt_version_query & NETLOGON_VERSION_WITH_CLOSEST_SITE) {
- nt_version_query &= ~NETLOGON_VERSION_WITH_CLOSEST_SITE;
+ if (nt_version_query & NETLOGON_NT_VERSION_WITH_CLOSEST_SITE) {
+ nt_version_query &= ~NETLOGON_NT_VERSION_WITH_CLOSEST_SITE;
}
ndr_err = ndr_pull_union_blob_all(blob, mem_ctx, r, nt_version_query,
(ndr_pull_flags_fn_t)ndr_pull_nbt_cldap_netlogon);
if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
goto done;
}
- if (nt_version_query & NETLOGON_VERSION_5EX_WITH_IP) {
- nt_version_query &= ~NETLOGON_VERSION_5EX_WITH_IP;
+ if (nt_version_query & NETLOGON_NT_VERSION_5EX_WITH_IP) {
+ nt_version_query &= ~NETLOGON_NT_VERSION_5EX_WITH_IP;
}
ndr_err = ndr_pull_union_blob_all(blob, mem_ctx, r, nt_version_query,
(ndr_pull_flags_fn_t)ndr_pull_nbt_cldap_netlogon);
if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
goto done;
}
- if (nt_version_query & NETLOGON_VERSION_5EX) {
- nt_version_query &= ~NETLOGON_VERSION_5EX;
+ if (nt_version_query & NETLOGON_NT_VERSION_5EX) {
+ nt_version_query &= ~NETLOGON_NT_VERSION_5EX;
}
ndr_err = ndr_pull_union_blob_all(blob, mem_ctx, r, nt_version_query,
(ndr_pull_flags_fn_t)ndr_pull_nbt_cldap_netlogon);
if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
goto done;
}
- if (nt_version_query & NETLOGON_VERSION_5) {
- nt_version_query &= ~NETLOGON_VERSION_5;
+ if (nt_version_query & NETLOGON_NT_VERSION_5) {
+ nt_version_query &= ~NETLOGON_NT_VERSION_5;
}
ndr_err = ndr_pull_union_blob_all(blob, mem_ctx, r, nt_version_query,
(ndr_pull_flags_fn_t)ndr_pull_nbt_cldap_netlogon);
diff --git a/source3/librpc/gen_ndr/nbt.h b/source3/librpc/gen_ndr/nbt.h
index 0943ee1..847f63b 100644
--- a/source3/librpc/gen_ndr/nbt.h
+++ b/source3/librpc/gen_ndr/nbt.h
@@ -412,16 +412,16 @@ enum nbt_netlogon_command
;
/* bitmap nbt_netlogon_version */
-#define NETLOGON_VERSION_1 ( 0x00000001 )
-#define NETLOGON_VERSION_5 ( 0x00000002 )
-#define NETLOGON_VERSION_5EX ( 0x00000004 )
-#define NETLOGON_VERSION_5EX_WITH_IP ( 0x00000008 )
-#define NETLOGON_VERSION_WITH_CLOSEST_SITE ( 0x00000010 )
-#define NETLOGON_VERSION_AVOID_NT4_EMUL ( 0x01000000 )
-#define NETLOGON_VERSION_PDC ( 0x10000000 )
-#define NETLOGON_VERSION_IP ( 0x20000000 )
-#define NETLOGON_VERSION_LOCAL ( 0x40000000 )
-#define NETLOGON_VERSION_GC ( 0x80000000 )
+#define NETLOGON_NT_VERSION_1 ( 0x00000001 )
+#define NETLOGON_NT_VERSION_5 ( 0x00000002 )
+#define NETLOGON_NT_VERSION_5EX ( 0x00000004 )
+#define NETLOGON_NT_VERSION_5EX_WITH_IP ( 0x00000008 )
+#define NETLOGON_NT_VERSION_WITH_CLOSEST_SITE ( 0x00000010 )
+#define NETLOGON_NT_VERSION_AVIOD_NT4EMUL ( 0x01000000 )
+#define NETLOGON_NT_VERSION_PDC ( 0x10000000 )
+#define NETLOGON_NT_VERSION_IP ( 0x20000000 )
+#define NETLOGON_NT_VERSION_LOCAL ( 0x40000000 )
+#define NETLOGON_NT_VERSION_GC ( 0x80000000 )
struct nbt_netlogon_query_for_pdc {
const char * computer_name;/*
[flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
diff --git a/source3/librpc/gen_ndr/ndr_nbt.c b/source3/librpc/gen_ndr/ndr_nbt.c
index 01cccd6..d165e65 100644
--- a/source3/librpc/gen_ndr/ndr_nbt.c
+++ b/source3/librpc/gen_ndr/ndr_nbt.c
@@ -1608,16 +1608,16 @@ _PUBLIC_ void ndr_print_nbt_netlogon_version(struct
ndr_print *ndr, const char *
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_LITTLE_ENDIAN);
ndr_print_uint32(ndr, name, r);
ndr->depth++;
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_1", NETLOGON_VERSION_1, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_5", NETLOGON_VERSION_5, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_5EX", NETLOGON_VERSION_5EX, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_5EX_WITH_IP", NETLOGON_VERSION_5EX_WITH_IP, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_WITH_CLOSEST_SITE", NETLOGON_VERSION_WITH_CLOSEST_SITE, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_AVOID_NT4_EMUL", NETLOGON_VERSION_AVOID_NT4_EMUL, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_PDC", NETLOGON_VERSION_PDC, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_IP", NETLOGON_VERSION_IP, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_LOCAL", NETLOGON_VERSION_LOCAL, r);
- ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_VERSION_GC", NETLOGON_VERSION_GC, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_1", NETLOGON_NT_VERSION_1, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_5", NETLOGON_NT_VERSION_5, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_5EX", NETLOGON_NT_VERSION_5EX, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_5EX_WITH_IP", NETLOGON_NT_VERSION_5EX_WITH_IP, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_WITH_CLOSEST_SITE", NETLOGON_NT_VERSION_WITH_CLOSEST_SITE,
r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_AVIOD_NT4EMUL", NETLOGON_NT_VERSION_AVIOD_NT4EMUL, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_PDC", NETLOGON_NT_VERSION_PDC, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_IP", NETLOGON_NT_VERSION_IP, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_LOCAL", NETLOGON_NT_VERSION_LOCAL, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"NETLOGON_NT_VERSION_GC", NETLOGON_NT_VERSION_GC, r);
ndr->depth--;
ndr->flags = _flags_save_BITMAP;
}
diff --git a/source3/librpc/idl/nbt.idl b/source3/librpc/idl/nbt.idl
index da1eb2e..f743109 100644
--- a/source3/librpc/idl/nbt.idl
+++ b/source3/librpc/idl/nbt.idl
@@ -350,16 +350,16 @@ interface nbt
} nbt_netlogon_command;
typedef [flag(NDR_LITTLE_ENDIAN),bitmap32bit] bitmap {
- NETLOGON_VERSION_1 = 0x00000001,
- NETLOGON_VERSION_5 = 0x00000002,
- NETLOGON_VERSION_5EX = 0x00000004,
- NETLOGON_VERSION_5EX_WITH_IP = 0x00000008,
- NETLOGON_VERSION_WITH_CLOSEST_SITE = 0x00000010,
- NETLOGON_VERSION_AVOID_NT4_EMUL = 0x01000000,
- NETLOGON_VERSION_PDC = 0x10000000,
- NETLOGON_VERSION_IP = 0x20000000,
- NETLOGON_VERSION_LOCAL = 0x40000000,
- NETLOGON_VERSION_GC = 0x80000000
+ NETLOGON_NT_VERSION_1 = 0x00000001,
+ NETLOGON_NT_VERSION_5 = 0x00000002,
+ NETLOGON_NT_VERSION_5EX = 0x00000004,
+ NETLOGON_NT_VERSION_5EX_WITH_IP = 0x00000008,
+ NETLOGON_NT_VERSION_WITH_CLOSEST_SITE = 0x00000010,
+ NETLOGON_NT_VERSION_AVIOD_NT4EMUL = 0x01000000,
+ NETLOGON_NT_VERSION_PDC = 0x10000000,
+ NETLOGON_NT_VERSION_IP = 0x20000000,
+ NETLOGON_NT_VERSION_LOCAL = 0x40000000,
+ NETLOGON_NT_VERSION_GC = 0x80000000
} nbt_netlogon_version;
/* query for pdc request */
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index e822635..4cc587c 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -1117,19 +1117,19 @@ static uint32_t map_ds_flags_to_nt_version(uint32_t
flags)
uint32_t nt_version = 0;
if (flags & DS_PDC_REQUIRED) {
- nt_version |= NETLOGON_VERSION_PDC;
+ nt_version |= NETLOGON_NT_VERSION_PDC;
}
if (flags & DS_GC_SERVER_REQUIRED) {
- nt_version |= NETLOGON_VERSION_GC;
+ nt_version |= NETLOGON_NT_VERSION_GC;
}
if (flags & DS_TRY_NEXTCLOSEST_SITE) {
- nt_version |= NETLOGON_VERSION_WITH_CLOSEST_SITE;
+ nt_version |= NETLOGON_NT_VERSION_WITH_CLOSEST_SITE;
}
if (flags & DS_IP_REQUIRED) {
- nt_version |= NETLOGON_VERSION_IP;
+ nt_version |= NETLOGON_NT_VERSION_IP;
}
return nt_version;
@@ -1148,8 +1148,8 @@ static NTSTATUS process_dc_dns(TALLOC_CTX *mem_ctx,
int i = 0;
bool valid_dc = false;
union nbt_cldap_netlogon *r = NULL;
- uint32_t nt_version = NETLOGON_VERSION_5 |
- NETLOGON_VERSION_5EX;
+ uint32_t nt_version = NETLOGON_NT_VERSION_5 |
+ NETLOGON_NT_VERSION_5EX;
uint32_t ret_flags = 0;
NTSTATUS status;
@@ -1236,9 +1236,9 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
fstring tmp_dc_name;
union nbt_cldap_netlogon *r = NULL;
bool store_cache = false;
- uint32_t nt_version = NETLOGON_VERSION_1 |
- NETLOGON_VERSION_5 |
- NETLOGON_VERSION_5EX_WITH_IP;
+ uint32_t nt_version = NETLOGON_NT_VERSION_1 |
+ NETLOGON_NT_VERSION_5 |
+ NETLOGON_NT_VERSION_5EX_WITH_IP;
if (!msg_ctx) {
msg_ctx = msg_context(mem_ctx);
@@ -1295,7 +1295,7 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
ZERO_STRUCT(logon1);
- nt_version = NETLOGON_VERSION_1;
+ nt_version = NETLOGON_NT_VERSION_1;
logon1.nt_version = nt_version;
logon1.pdc_name = tmp_dc_name;
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index ce85164..db43101 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1080,7 +1080,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
fstring name )
{
struct ip_service ip_list;
- uint32_t nt_version = NETLOGON_VERSION_1;
+ uint32_t nt_version = NETLOGON_NT_VERSION_1;
ip_list.ss = *pss;
ip_list.port = 0;
--
Samba Shared Repository
