r22975: BUG 4616: Don't return a dns or forest name when replying to the

DsDGetPrimaryRoleInfo() and configured for security = domain.

diff --git a/source/rpc_server/srv_lsa_ds_nt.c b/source/rpc_server/srv_lsa_ds_nt.c
index f387bec9b6d757485be2f6bc5ab5290ba3faf043..17543a38ef625772b0b725f1d66c2d095777be44 100644 (file)
--- a/source/rpc_server/srv_lsa_ds_nt.c
+++ b/source/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;