X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=source3%2Frpc_server%2Frpc_config.c;h=9ee7ecaf96f5d1b0ff42d4ea063c89c7015a57df;hp=23c6f88eac4e31e8a6cebe67ca553f7df45907a3;hb=e23e8d9ff9144dabea8738c9ab28862c5996c9a8;hpb=e13b21d9644445636a7657c73f501772ac8d96bf

diff --git a/source3/rpc_server/rpc_config.c b/source3/rpc_server/rpc_config.c
index 23c6f88eac4..9ee7ecaf96f 100644
--- a/source3/rpc_server/rpc_config.c
+++ b/source3/rpc_server/rpc_config.c
@@ -47,6 +47,7 @@ enum rpc_service_mode_e rpc_service_mode(const char *name)
 	const char *rpcsrv_type;
 	enum rpc_service_mode_e state;
 	const char *def;
+	enum server_role server_role = lp_server_role();
 	int i;
 
 	/* Handle pipes with multiple names */
@@ -71,6 +72,21 @@ enum rpc_service_mode_e rpc_service_mode(const char *name)
 		}
 	}
 
+	/*
+	 * Only enable the netlogon server by default if we are a
+	 * classic/NT4 domain controller
+	 */
+	if (strcasecmp_m(name, "netlogon") == 0) {
+		switch (server_role) {
+		case ROLE_STANDALONE:
+		case ROLE_DOMAIN_MEMBER:
+			def = "disabled";
+			break;
+		default:
+			break;
+		}
+	}
+
 	rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
 					   "rpc_server", pipe_name, def);