fixing domain join and domain login problems

(This used to be commit 90a24664318da97a6e8cfe4622a8573c0e3cbe5e)

1 files changed, 19 insertions, 0 deletions

diff --git a/source3/rpc_server/srv_sid.c b/source3/rpc_server/srv_sid.c
index a8a94204c1..216fab657f 100644
--- a/source3/rpc_server/srv_sid.c
+++ b/source3/rpc_server/srv_sid.c
@@ -162,6 +162,25 @@ BOOL get_member_domain_sid(void)
 	fstring dom3;
 	fstring dom5;
 
+	switch (lp_server_role())
+	{
+		case ROLE_DOMAIN_NONE:
+		{
+			ZERO_STRUCT(global_member_sid);
+			return True;
+		}
+		case ROLE_DOMAIN_PDC:
+		{
+			sid_copy(&global_member_sid, &global_sam_sid);
+			return True;
+		}
+		default:
+		{
+			/* member or BDC, we're going for connection to PDC */
+			break;
+		}
+	}
+
 	if (!cli_connect_serverlist(&cli, lp_passwordserver()))
 	{
 		DEBUG(0,("get_member_domain_sid: unable to initialise client connection.\n"));