svn commit: samba r22975 - in branches: SAMBA_3_0/source/rpc_server
SAMBA_3_0_25/source/rpc_server SAMBA_3_0_26/source/rpc_server
jerry at samba.org
jerry at samba.org
Thu May 17 19:16:28 GMT 2007
Author: jerry
Date: 2007-05-17 19:16:27 +0000 (Thu, 17 May 2007)
New Revision: 22975
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22975
Log:
BUG 4616: Don't return a dns or forest name when replying to the
DsDGetPrimaryRoleInfo() and configured for security = domain.
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_lsa_ds_nt.c
branches/SAMBA_3_0_25/source/rpc_server/srv_lsa_ds_nt.c
branches/SAMBA_3_0_26/source/rpc_server/srv_lsa_ds_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_lsa_ds_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_lsa_ds_nt.c 2007-05-17 18:20:16 UTC (rev 22974)
+++ branches/SAMBA_3_0/source/rpc_server/srv_lsa_ds_nt.c 2007-05-17 19:16:27 UTC (rev 22975)
@@ -84,16 +84,16 @@
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;
Modified: branches/SAMBA_3_0_25/source/rpc_server/srv_lsa_ds_nt.c
===================================================================
--- branches/SAMBA_3_0_25/source/rpc_server/srv_lsa_ds_nt.c 2007-05-17 18:20:16 UTC (rev 22974)
+++ branches/SAMBA_3_0_25/source/rpc_server/srv_lsa_ds_nt.c 2007-05-17 19:16:27 UTC (rev 22975)
@@ -84,16 +84,16 @@
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;
Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_lsa_ds_nt.c
===================================================================
--- branches/SAMBA_3_0_26/source/rpc_server/srv_lsa_ds_nt.c 2007-05-17 18:20:16 UTC (rev 22974)
+++ branches/SAMBA_3_0_26/source/rpc_server/srv_lsa_ds_nt.c 2007-05-17 19:16:27 UTC (rev 22975)
@@ -84,16 +84,16 @@
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;
More information about the samba-cvs
mailing list