[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1170-gd896fb2

[Günther Deschner]

The branch, master has been updated
       via  d896fb2dabaca650130ad6cea59eb3a66879470f (commit)
      from  61ca4c491e1c13eb7d97847f743b0f540f1117c4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d896fb2dabaca650130ad6cea59eb3a66879470f
Author: Günther Deschner <gd at samba.org>
Date:   Tue Aug 25 11:10:53 2009 +0200

    netlogon: give netlogon w7/w2k8r2 AES negotiate flag proper name (see bug #6099 for details).
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 librpc/gen_ndr/ndr_netlogon.c |    2 +-
 librpc/gen_ndr/netlogon.h     |    2 +-
 librpc/idl/netlogon.idl       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/ndr_netlogon.c b/librpc/gen_ndr/ndr_netlogon.c
index 8bb22d8..e7a4121 100644
--- a/librpc/gen_ndr/ndr_netlogon.c
+++ b/librpc/gen_ndr/ndr_netlogon.c
@@ -6508,7 +6508,7 @@ _PUBLIC_ void ndr_print_netr_NegotiateFlags(struct ndr_print *ndr, const char *n
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_NEG_NEUTRALIZE_NT4_EMULATION", NETLOGON_NEG_NEUTRALIZE_NT4_EMULATION, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_NEG_RODC_PASSTHROUGH", NETLOGON_NEG_RODC_PASSTHROUGH, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_NEG_SUPPORTS_AES_SHA2", NETLOGON_NEG_SUPPORTS_AES_SHA2, r);
-	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_NEG_0x01000000", NETLOGON_NEG_0x01000000, r);
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_NEG_SUPPORTS_AES", NETLOGON_NEG_SUPPORTS_AES, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_NEG_AUTHENTICATED_RPC_LSASS", NETLOGON_NEG_AUTHENTICATED_RPC_LSASS, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "NETLOGON_NEG_AUTHENTICATED_RPC", NETLOGON_NEG_AUTHENTICATED_RPC, r);
 	ndr->depth--;
diff --git a/librpc/gen_ndr/netlogon.h b/librpc/gen_ndr/netlogon.h
index bc8ff12..9cf3828 100644
--- a/librpc/gen_ndr/netlogon.h
+++ b/librpc/gen_ndr/netlogon.h
@@ -754,7 +754,7 @@ union netr_CONTROL_DATA_INFORMATION {
 #define NETLOGON_NEG_NEUTRALIZE_NT4_EMULATION ( 0x00100000 )
 #define NETLOGON_NEG_RODC_PASSTHROUGH ( 0x00200000 )
 #define NETLOGON_NEG_SUPPORTS_AES_SHA2 ( 0x00400000 )
-#define NETLOGON_NEG_0x01000000 ( 0x01000000 )
+#define NETLOGON_NEG_SUPPORTS_AES ( 0x01000000 )
 #define NETLOGON_NEG_AUTHENTICATED_RPC_LSASS ( 0x20000000 )
 #define NETLOGON_NEG_AUTHENTICATED_RPC ( 0x40000000 )
 
diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index 2a2a6eb..8b74f14 100644
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -961,7 +961,7 @@ interface netlogon
 		NETLOGON_NEG_NEUTRALIZE_NT4_EMULATION	= 0x00100000,
 		NETLOGON_NEG_RODC_PASSTHROUGH		= 0x00200000,
 		NETLOGON_NEG_SUPPORTS_AES_SHA2		= 0x00400000,
-		NETLOGON_NEG_0x01000000			= 0x01000000,
+		NETLOGON_NEG_SUPPORTS_AES		= 0x01000000,
 		NETLOGON_NEG_AUTHENTICATED_RPC_LSASS	= 0x20000000,
 		NETLOGON_NEG_AUTHENTICATED_RPC		= 0x40000000
 	} netr_NegotiateFlags;


-- 
Samba Shared Repository