Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration

(This used to be commit d841a3fc999c5ebd9e9d54b2bd5099b1b50402b1)

2 files changed, 18 insertions, 96 deletions

diff --git a/source3/librpc/idl/netlogon.idl b/source3/librpc/idl/netlogon.idl
index f485f8e26e..30b1119067 100644
--- a/source3/librpc/idl/netlogon.idl
+++ b/source3/librpc/idl/netlogon.idl
@@ -918,8 +918,7 @@ interface netlogon
 	/*****************/
 	/* Function 0x14 */
 
-	/* two unkown bits still: DS_IP_VERSION_AGNOSTIC and
-	 * DS_TRY_NEXTCLOSEST_SITE - Guenther */
+	/* one unkown bit still: DS_IP_VERSION_AGNOSTIC - gd*/
 
 	typedef [bitmap32bit] bitmap {
 		DS_FORCE_REDISCOVERY		= 0x00000001,
@@ -937,6 +936,8 @@ interface netlogon
 		DS_ONLY_LDAP_NEEDED		= 0x00008000,
 		DS_IS_FLAT_NAME			= 0x00010000,
 		DS_IS_DNS_NAME			= 0x00020000,
+		DS_TRY_NEXTCLOSEST_SITE		= 0x00040000,
+		DS_DIRECTORY_SERVICE_6_REQUIRED = 0x00080000,
 		DS_RETURN_DNS_NAME		= 0x40000000,
 		DS_RETURN_FLAT_NAME		= 0x80000000
 	} netr_DsRGetDCName_flags;
@@ -947,19 +948,21 @@ interface netlogon
 	} netr_DsRGetDCNameInfo_AddressType;
 
 	typedef [bitmap32bit] bitmap {
-		DS_SERVER_PDC		 = 0x00000001 /* NBT_SERVER_PDC */,
-		DS_SERVER_GC		 = 0x00000004 /* NBT_SERVER_GC */,
-		DS_SERVER_LDAP		 = 0x00000008 /* NBT_SERVER_LDAP */,
-		DS_SERVER_DS		 = 0x00000010 /* NBT_SERVER_DS */,
-		DS_SERVER_KDC		 = 0x00000020 /* NBT_SERVER_KDC */,
-		DS_SERVER_TIMESERV	 = 0x00000040 /* NBT_SERVER_TIMESERV */,
-		DS_SERVER_CLOSEST	 = 0x00000080 /* NBT_SERVER_CLOSEST */,
-		DS_SERVER_WRITABLE	 = 0x00000100 /* NBT_SERVER_WRITABLE */,
-		DS_SERVER_GOOD_TIMESERV	 = 0x00000200 /* NBT_SERVER_GOOD_TIMESERV */,
-		DS_SERVER_NDNC		 = 0x00000400,
-		DS_DNS_CONTROLLER	 = 0x20000000,
-		DS_DNS_DOMAIN		 = 0x40000000,
-		DS_DNS_FOREST		 = 0x80000000
+		DS_SERVER_PDC			 = 0x00000001 /* NBT_SERVER_PDC */,
+		DS_SERVER_GC			 = 0x00000004 /* NBT_SERVER_GC */,
+		DS_SERVER_LDAP			 = 0x00000008 /* NBT_SERVER_LDAP */,
+		DS_SERVER_DS			 = 0x00000010 /* NBT_SERVER_DS */,
+		DS_SERVER_KDC			 = 0x00000020 /* NBT_SERVER_KDC */,
+		DS_SERVER_TIMESERV		 = 0x00000040 /* NBT_SERVER_TIMESERV */,
+		DS_SERVER_CLOSEST		 = 0x00000080 /* NBT_SERVER_CLOSEST */,
+		DS_SERVER_WRITABLE		 = 0x00000100 /* NBT_SERVER_WRITABLE */,
+		DS_SERVER_GOOD_TIMESERV		 = 0x00000200 /* NBT_SERVER_GOOD_TIMESERV */,
+		DS_SERVER_NDNC			 = 0x00000400,
+		DS_SERVER_SELECT_SECRET_DOMAIN_6 = 0x00000800,
+		DS_SERVER_FULL_SECRET_DOMAIN_6	 = 0x00001000,
+		DS_DNS_CONTROLLER		 = 0x20000000,
+		DS_DNS_DOMAIN			 = 0x40000000,
+		DS_DNS_FOREST			 = 0x80000000
 	} netr_DsR_DcFlags;
 
 	typedef struct {
diff --git a/source3/librpc/ndr/ndr_misc.c b/source3/librpc/ndr/ndr_misc.c
index c806298ce5..79761b9251 100644
--- a/source3/librpc/ndr/ndr_misc.c
+++ b/source3/librpc/ndr/ndr_misc.c
@@ -85,84 +85,3 @@ void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct s
 #endif
 	ndr->depth--;
 }
-
-void ndr_print_ads_struct(struct ndr_print *ndr, const char *name, const struct ads_struct *r)
-{
-	if (!r) { return; }
-
-	ndr_print_struct(ndr, name, "ads_struct");
-	ndr->depth++;
-	ndr_print_bool(ndr, "is_mine", r->is_mine);
-	ndr_print_struct(ndr, name, "server");
-	ndr->depth++;
-	ndr_print_string(ndr, "realm", r->server.realm);
-	ndr_print_string(ndr, "workgroup", r->server.workgroup);
-	ndr_print_string(ndr, "ldap_server", r->server.ldap_server);
-	ndr_print_bool(ndr, "foreign", r->server.foreign);
-	ndr->depth--;
-	ndr_print_struct(ndr, name, "auth");
-	ndr->depth++;
-	ndr_print_string(ndr, "realm", r->auth.realm);
-#ifdef DEBUG_PASSWORD
-	ndr_print_string(ndr, "password", r->auth.password);
-#else
-	ndr_print_string(ndr, "password", "(PASSWORD ommited)");
-#endif
-	ndr_print_string(ndr, "user_name", r->auth.user_name);
-	ndr_print_string(ndr, "kdc_server", r->auth.kdc_server);
-	ndr_print_uint32(ndr, "flags", r->auth.flags);
-	ndr_print_uint32(ndr, "time_offset", r->auth.time_offset);
-	ndr_print_time_t(ndr, "tgt_expire", r->auth.tgt_expire);
-	ndr_print_time_t(ndr, "tgs_expire", r->auth.tgs_expire);
-	ndr_print_time_t(ndr, "renewable", r->auth.renewable);
-	ndr->depth--;
-	ndr_print_struct(ndr, name, "config");
-	ndr->depth++;
-	ndr_print_uint32(ndr, "flags", r->config.flags);
-	ndr_print_string(ndr, "realm", r->config.realm);
-	ndr_print_string(ndr, "bind_path", r->config.bind_path);
-	ndr_print_string(ndr, "ldap_server_name", r->config.ldap_server_name);
-	ndr_print_string(ndr, "server_site_name", r->config.server_site_name);
-	ndr_print_string(ndr, "client_site_name", r->config.client_site_name);
-	ndr_print_time_t(ndr, "current_time", r->config.current_time);
-	ndr_print_bool(ndr, "tried_closest_dc", r->config.tried_closest_dc);
-	ndr_print_string(ndr, "schema_path", r->config.schema_path);
-	ndr_print_string(ndr, "config_path", r->config.config_path);
-	ndr->depth--;
-#ifdef HAVE_LDAP
-	ndr_print_struct(ndr, name, "ldap");
-	ndr->depth++;
-	ndr_print_ptr(ndr, "ld", r->ldap.ld);
-	ndr_print_sockaddr_storage(ndr, "ss", &r->ldap.ss);
-	ndr_print_time_t(ndr, "last_attempt", r->ldap.last_attempt);
-	ndr_print_uint32(ndr, "port", r->ldap.port);
-	ndr_print_uint16(ndr, "wrap_type", r->ldap.wrap_type);
-#ifdef HAVE_LDAP_SASL_WRAPPING
-	ndr_print_ptr(ndr, "sbiod", r->ldap.sbiod);
-#endif /* HAVE_LDAP_SASL_WRAPPING */
-	ndr_print_ptr(ndr, "mem_ctx", r->ldap.mem_ctx);
-	ndr_print_ptr(ndr, "wrap_ops", r->ldap.wrap_ops);
-	ndr_print_ptr(ndr, "wrap_private_data", r->ldap.wrap_private_data);
-	ndr_print_struct(ndr, name, "in");
-	ndr->depth++;
-	ndr_print_uint32(ndr, "ofs", r->ldap.in.ofs);
-	ndr_print_uint32(ndr, "needed", r->ldap.in.needed);
-	ndr_print_uint32(ndr, "left", r->ldap.in.left);
-	ndr_print_uint32(ndr, "max_wrapped", r->ldap.in.max_wrapped);
-	ndr_print_uint32(ndr, "min_wrapped", r->ldap.in.min_wrapped);
-	ndr_print_uint32(ndr, "size", r->ldap.in.size);
-	ndr_print_array_uint8(ndr, "buf", r->ldap.in.buf, r->ldap.in.size);
-	ndr->depth--;
-	ndr_print_struct(ndr, name, "out");
-	ndr->depth++;
-	ndr_print_uint32(ndr, "ofs", r->ldap.out.ofs);
-	ndr_print_uint32(ndr, "left", r->ldap.out.left);
-	ndr_print_uint32(ndr, "max_unwrapped", r->ldap.out.max_unwrapped);
-	ndr_print_uint32(ndr, "sig_size", r->ldap.out.sig_size);
-	ndr_print_uint32(ndr, "size", r->ldap.out.size);
-	ndr_print_array_uint8(ndr, "buf", r->ldap.out.buf, r->ldap.out.size);
-	ndr->depth--;
-	ndr->depth--;
-#endif /* HAVE_LDAP */
-	ndr->depth--;
-}