Attachment 1563 Details for Bug 3224 – Patch I've applied to 3.0

[patch] Patch I've applied to 3.0

look (text/plain), 5.40 KB, created by Jeremy Allison on 2005-11-03 17:04:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2005-11-03 17:04:12 UTC

Size: 5.40 KB

patch

obsolete

>Index: rpc_client/cli_pipe.c
>===================================================================
>--- rpc_client/cli_pipe.c	(revision 11491)
>+++ rpc_client/cli_pipe.c	(working copy)
>@@ -2409,7 +2409,7 @@
> 		return NULL;
> 	}
> 
>-	if ( IS_DC ) {
>+        if ( IS_DC && !strequal(domain, lp_workgroup()) && lp_allow_trusted_domains()) {
> 		fstrcpy( machine_account, lp_workgroup() );
>         } else {
>                 /* Hmmm. Is this correct for trusted domains when we're a member server ? JRA. */
>@@ -2421,9 +2421,10 @@
>         }
> 
> 	*perr = rpccli_netlogon_setup_creds(netlogon_pipe,
>-					cli->desthost,
>-					domain,
>-					machine_account,
>+					cli->desthost, /* server name */
>+					domain,	       /* domain */
>+					global_myname(), /* client name */
>+					machine_account, /* machine account name */
> 					machine_pwd,
> 					sec_chan_type,
> 					&neg_flags);
>@@ -2531,7 +2532,10 @@
> 		return NULL;
> 	}
> 
>-	if ( IS_DC ) {
>+        /* if we are a DC and this is a trusted domain, then we need to use our
>+           domain name in the net_req_auth2() request */
>+
>+        if ( IS_DC && !strequal(domain, lp_workgroup()) && lp_allow_trusted_domains()) {
> 		fstrcpy( machine_account, lp_workgroup() );
>         } else {
>                 /* Hmmm. Is this correct for trusted domains when we're a member server ? JRA. */
>@@ -2543,9 +2547,10 @@
>         }
> 
> 	*perr = rpccli_netlogon_setup_creds(netlogon_pipe,
>-					cli->desthost,
>-					domain,
>-					machine_account,
>+					cli->desthost,     /* server name */
>+					domain,            /* domain */
>+					global_myname(),   /* client name */
>+					machine_account,   /* machine account name */
> 					machine_pwd,
> 					sec_chan_type,
> 					&neg_flags);
>Index: rpc_client/cli_netlogon.c
>===================================================================
>--- rpc_client/cli_netlogon.c	(revision 11485)
>+++ rpc_client/cli_netlogon.c	(working copy)
>@@ -254,6 +254,7 @@
> NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
> 				const char *server_name,
> 				const char *domain,
>+				const char *clnt_name,
> 				const char *machine_account,
> 				const unsigned char machine_pwd[16],
> 				uint32 sec_chan_type,
>@@ -291,7 +292,7 @@
> 	result = rpccli_net_req_chal(cli,
> 				cli->mem_ctx,
> 				dc->remote_machine,
>-				machine_account,
>+				clnt_name,
> 				&clnt_chal_send,
> 				&srv_chal_recv);
> 
>@@ -315,7 +316,7 @@
> 			dc->remote_machine,
> 			dc->mach_acct,
> 			sec_chan_type,
>-			machine_account,
>+			clnt_name,
> 			neg_flags_inout,
> 			&clnt_chal_send, /* input. */
> 			&srv_chal_recv); /* output */
>Index: rpcclient/rpcclient.c
>===================================================================
>--- rpcclient/rpcclient.c	(revision 11485)
>+++ rpcclient/rpcclient.c	(working copy)
>@@ -573,9 +573,10 @@
> 			}
> 		
> 			ntresult = rpccli_netlogon_setup_creds(cmd_entry->rpc_pipe,
>-						cli->desthost,
>-						lp_workgroup(),
>-						global_myname(),
>+						cli->desthost,   /* server name */
>+						lp_workgroup(),  /* domain */
>+						global_myname(), /* client name */
>+						global_myname(), /* machine account name */
> 						trust_password,
> 						sec_channel_type,
> 						&neg_flags);
>Index: auth/auth_domain.c
>===================================================================
>--- auth/auth_domain.c	(revision 11485)
>+++ auth/auth_domain.c	(working copy)
>@@ -131,9 +131,10 @@
> 		}
> 
> 		result = rpccli_netlogon_setup_creds(netlogon_pipe,
>-					dc_name,
>-					domain,
>-					global_myname(),
>+					dc_name, /* server name */
>+					domain, /* domain */
>+					global_myname(), /* client name */
>+					global_myname(), /* machine account name */
> 					machine_pwd,
> 					sec_chan_type,
> 					&neg_flags);
>Index: nsswitch/winbindd_cm.c
>===================================================================
>--- nsswitch/winbindd_cm.c	(revision 11485)
>+++ nsswitch/winbindd_cm.c	(working copy)
>@@ -1352,10 +1352,11 @@
> 		return NT_STATUS_NO_MEMORY;
> 	}
> 
>-	result = rpccli_netlogon_setup_creds
>-		(netlogon_pipe,
>+	result = rpccli_netlogon_setup_creds(
>+		 netlogon_pipe,
> 		 domain->dcname, /* server name. */
> 		 domain->name,   /* domain name */
>+		 global_myname(), /* client name */
> 		 account_name,   /* machine account */
> 		 mach_pwd,       /* machine password */
> 		 sec_chan_type,  /* from get_trust_pw */
>Index: libsmb/trusts_util.c
>===================================================================
>--- libsmb/trusts_util.c	(revision 11485)
>+++ libsmb/trusts_util.c	(working copy)
>@@ -44,9 +44,10 @@
> 		uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS;
> 
> 		result = rpccli_netlogon_setup_creds(cli, 
>-					cli->cli->desthost,
>-					lp_workgroup(),
>-					global_myname(),
>+					cli->cli->desthost, /* server name */
>+					lp_workgroup(), /* domain */
>+					global_myname(), /* client name */
>+					global_myname(), /* machine account name */
> 					orig_trust_passwd_hash,
> 					sec_channel_type,
> 					&neg_flags);
>Index: utils/net_rpc_join.c
>===================================================================
>--- utils/net_rpc_join.c	(revision 11485)
>+++ utils/net_rpc_join.c	(working copy)
>@@ -303,9 +303,10 @@
> 	}
> 
> 	result = rpccli_netlogon_setup_creds(pipe_hnd,
>-					cli->desthost,
>-					domain,
>-					global_myname(),
>+					cli->desthost, /* server name */
>+					domain,        /* domain */
>+					global_myname(), /* client name */
>+					global_myname(), /* machine account name */
>                                         md4_trust_password,
>                                         sec_channel_type,
>                                         &neg_flags);

Actions: View

Attachments on bug 3224: 1552 | 1553 | 1561 | 1562 | 1563