svn commit: samba r7378 - in branches/SAMBA_4_0/source: cldap_server nbt_server/dgram

[abartlet at samba.org]

Author: abartlet
Date: 2005-06-07 23:06:24 +0000 (Tue, 07 Jun 2005)
New Revision: 7378

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7378

Log:
Lowercase netbios name when forming the DNS name of the DC in the
NETLOGON reply.

Use the kdc server service to determine if we are a kdc (no more
krb5:kdc=yes).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/cldap_server/netlogon.c
   branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c


Changeset:
Modified: branches/SAMBA_4_0/source/cldap_server/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/cldap_server/netlogon.c	2005-06-07 22:09:18 UTC (rev 7377)
+++ branches/SAMBA_4_0/source/cldap_server/netlogon.c	2005-06-07 23:06:24 UTC (rev 7378)
@@ -83,19 +83,21 @@
 		NBT_SERVER_CLOSEST | NBT_SERVER_WRITABLE | 
 		NBT_SERVER_GOOD_TIMESERV;
 
-	if (lp_parm_bool(-1, "krb5", "kdc", True)) {
-		server_type |= NBT_SERVER_KDC;
-	}
 	if (str_list_check(services, "ldap")) {
 		server_type |= NBT_SERVER_LDAP;
 	}
 
+	if (str_list_check(services, "kdc")) {
+		server_type |= NBT_SERVER_KDC;
+	}
+
 	pdc_name         = talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name());
 	domain_uuid      = samdb_result_guid(res[0], "objectGUID");
 	realm            = samdb_result_string(res[0], "realm", lp_realm());
 	dns_domain       = samdb_result_string(res[0], "dnsDomain", lp_realm());
 	pdc_dns_name     = talloc_asprintf(mem_ctx, "%s.%s", 
-					   lp_netbios_name(), dns_domain);
+					   strlower_talloc(mem_ctx, lp_netbios_name()), 
+					   dns_domain);
 	flatname         = samdb_result_string(res[0], "name", lp_workgroup());
 	site_name        = "Default-First-Site-Name";
 	site_name2       = "";

Modified: branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c	2005-06-07 22:09:18 UTC (rev 7377)
+++ branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c	2005-06-07 23:06:24 UTC (rev 7378)
@@ -118,20 +118,22 @@
 		NBT_SERVER_GOOD_TIMESERV;
 
 	/* hmm, probably a better way to do this */
-	if (lp_parm_bool(-1, "krb5", "kdc", True)) {
-		pdc->server_type |= NBT_SERVER_KDC;
-	}
 	if (str_list_check(services, "ldap")) {
 		pdc->server_type |= NBT_SERVER_LDAP;
 	}
 
+	if (str_list_check(services, "kdc")) {
+		pdc->server_type |= NBT_SERVER_KDC;
+	}
+
 	pdc->domain_uuid      = samdb_result_guid(res[0], "objectGUID");
 	pdc->forest           = samdb_result_string(res[0], "realm", lp_realm());
 	pdc->dns_domain       = samdb_result_string(res[0], "dnsDomain", lp_realm());
 
 	/* TODO: get our full DNS name from somewhere else */
 	pdc->pdc_dns_name     = talloc_asprintf(packet, "%s.%s", 
-						lp_netbios_name(), pdc->dns_domain);
+						strlower_talloc(packet, lp_netbios_name()), 
+						pdc->dns_domain);
 	pdc->domain           = name->name;
 	pdc->pdc_name         = lp_netbios_name();
 	pdc->user_name        = netlogon->req.pdc2.user_name;