svn commit: samba r6339 - in branches/SAMBA_4_0/source/nbt_server/dgram: .

[tridge at samba.org]

Author: tridge
Date: 2005-04-14 08:00:45 +0000 (Thu, 14 Apr 2005)
New Revision: 6339

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

Log:
set the NBT_SERVER_LDAP and NBT_SERVER_KDC bits based on config
(andrew, please fix the method of sseeing if we do krb5, if you can
think of a better one)


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


Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c	2005-04-14 07:40:23 UTC (rev 6338)
+++ branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c	2005-04-14 08:00:45 UTC (rev 6339)
@@ -80,6 +80,7 @@
 	const char *attrs[] = {"realm", "dnsDomain", "objectGUID", NULL};
 	struct ldb_message **res;
 	int ret;
+	const char **services = lp_server_services();
 
 	/* only answer getdc requests on the PDC or LOGON names */
 	if (name->type != NBT_NAME_PDC && name->type != NBT_NAME_LOGON) {
@@ -111,10 +112,19 @@
 
 	/* TODO: accurately depict which services we are running */
 	pdc->server_type      = 
-		NBT_SERVER_PDC | NBT_SERVER_GC | NBT_SERVER_LDAP |
-		NBT_SERVER_DS | NBT_SERVER_KDC | NBT_SERVER_TIMESERV |
-		NBT_SERVER_CLOSEST | NBT_SERVER_WRITABLE | NBT_SERVER_GOOD_TIMESERV;
+		NBT_SERVER_PDC | NBT_SERVER_GC | 
+		NBT_SERVER_DS | NBT_SERVER_TIMESERV |
+		NBT_SERVER_CLOSEST | NBT_SERVER_WRITABLE | 
+		NBT_SERVER_GOOD_TIMESERV;
 
+	/* hmm, probably a better way to do this */
+	if (lp_parm_bool(-1, "gensec", "krb5", True)) {
+		pdc->server_type |= NBT_SERVER_KDC;
+	}
+	if (str_list_check(services, "ldap")) {
+		pdc->server_type |= NBT_SERVER_LDAP;
+	}
+
 	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());