summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-05-17 19:16:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:12 -0500
commit4a50c674629c6ee0f01ab16aa1561c5acc17c5e2 (patch)
treed92a4df5560357f11c0644e69a75f158849ebb8e
parent04e62ae6350e30e6293be8e62cff169cd4509b2a (diff)
downloadsamba-4a50c674629c6ee0f01ab16aa1561c5acc17c5e2.tar.gz
samba-4a50c674629c6ee0f01ab16aa1561c5acc17c5e2.tar.bz2
samba-4a50c674629c6ee0f01ab16aa1561c5acc17c5e2.zip
r22975: BUG 4616: Don't return a dns or forest name when replying to the
DsDGetPrimaryRoleInfo() and configured for security = domain. (This used to be commit 55ba4a04d0efe2ae7b0d945648b2db801ff9e9f1)
-rw-r--r--source3/rpc_server/srv_lsa_ds_nt.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/rpc_server/srv_lsa_ds_nt.c b/source3/rpc_server/srv_lsa_ds_nt.c
index f387bec9b6..17543a38ef 100644
--- a/source3/rpc_server/srv_lsa_ds_nt.c
+++ b/source3/rpc_server/srv_lsa_ds_nt.c
@@ -84,16 +84,16 @@ static NTSTATUS fill_dsrole_dominfo_basic(TALLOC_CTX *ctx, DSROLE_PRIMARY_DOMAIN
basic->dnsname_ptr = 1;
init_unistr2( &basic->dns_domain, dnsdomain, UNI_STR_TERMINATE);
+
+ /* FIXME!! We really should fill in the correct forest
+ name. Should get this information from winbindd. */
basic->forestname_ptr = 1;
init_unistr2( &basic->forest_domain, dnsdomain, UNI_STR_TERMINATE);
} else {
- get_mydnsdomname(dnsdomain);
- strlower_m(dnsdomain);
-
- basic->dnsname_ptr = 1;
- init_unistr2( &basic->dns_domain, dnsdomain, UNI_FLAGS_NONE);
- basic->forestname_ptr = 1;
- init_unistr2( &basic->forest_domain, dnsdomain, UNI_FLAGS_NONE);
+ /* security = domain should not fill in the dns or
+ forest name */
+ basic->dnsname_ptr = 0;
+ basic->forestname_ptr = 0;
}
*info = basic;