svn commit: samba r10272 - in trunk/source/nsswitch: .

[jra at samba.org]

Author: jra
Date: 2005-09-16 17:20:45 +0000 (Fri, 16 Sep 2005)
New Revision: 10272

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

Log:
Fix winbindd - don't add two '$' signs on the end of the
machine account. Allows us to remove extra mem_ctx argument.
Jeremy.

Modified:
   trunk/source/nsswitch/winbindd_ads.c
   trunk/source/nsswitch/winbindd_cm.c
   trunk/source/nsswitch/winbindd_misc.c
   trunk/source/nsswitch/winbindd_pam.c


Changeset:
Modified: trunk/source/nsswitch/winbindd_ads.c
===================================================================
--- trunk/source/nsswitch/winbindd_ads.c	2005-09-16 16:42:40 UTC (rev 10271)
+++ trunk/source/nsswitch/winbindd_ads.c	2005-09-16 17:20:45 UTC (rev 10272)
@@ -823,7 +823,7 @@
 	*names       = NULL;
 	*dom_sids    = NULL;
 
-	result = cm_connect_netlogon(domain, mem_ctx, &cli);
+	result = cm_connect_netlogon(domain, &cli);
 
 	if (!NT_STATUS_IS_OK(result)) {
 		DEBUG(5, ("trusted_domains: Could not open a connection to %s "

Modified: trunk/source/nsswitch/winbindd_cm.c
===================================================================
--- trunk/source/nsswitch/winbindd_cm.c	2005-09-16 16:42:40 UTC (rev 10271)
+++ trunk/source/nsswitch/winbindd_cm.c	2005-09-16 17:20:45 UTC (rev 10272)
@@ -137,7 +137,7 @@
 		return False;
 	}
 
-	result = cm_connect_netlogon(our_domain, mem_ctx,&netlogon_pipe);
+	result = cm_connect_netlogon(our_domain, &netlogon_pipe);
 	if (!NT_STATUS_IS_OK(result)) {
 		return False;
 	}
@@ -962,9 +962,7 @@
 }
 
 #ifndef DISABLE_SCHANNEL_WIN2K3_SP1
-static BOOL cm_get_schannel_dcinfo(struct winbindd_domain *domain,
-				TALLOC_CTX *mem_ctx,
-				struct dcinfo **ppdc)
+static BOOL cm_get_schannel_dcinfo(struct winbindd_domain *domain, struct dcinfo **ppdc)
 {
 	NTSTATUS result;
 	struct rpc_pipe_client *netlogon_pipe;
@@ -973,7 +971,7 @@
 		return False;
 	}
 
-	result = cm_connect_netlogon(domain, mem_ctx, &netlogon_pipe);
+	result = cm_connect_netlogon(domain, &netlogon_pipe);
 	if (!NT_STATUS_IS_OK(result)) {
 		return False;
 	}
@@ -1002,7 +1000,7 @@
 #ifndef DISABLE_SCHANNEL_WIN2K3_SP1
 		struct dcinfo *p_dcinfo;
 
-		if (cm_get_schannel_dcinfo(domain, mem_ctx, &p_dcinfo)) {
+		if (cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
 			conn->samr_pipe = cli_rpc_pipe_open_schannel_with_key(conn->cli,
 								PI_SAMR,
 								PIPE_AUTH_LEVEL_PRIVACY,
@@ -1060,7 +1058,7 @@
 #ifndef DISABLE_SCHANNEL_WIN2K3_SP1
 		struct dcinfo *p_dcinfo;
 
-		if (cm_get_schannel_dcinfo(domain, mem_ctx, &p_dcinfo)) {
+		if (cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
 			conn->lsa_pipe = cli_rpc_pipe_open_schannel_with_key(conn->cli,
 								PI_LSARPC,
 								PIPE_AUTH_LEVEL_PRIVACY,
@@ -1099,8 +1097,7 @@
  session key stored in conn->netlogon_pipe->dc->sess_key.
 ****************************************************************************/
 
-NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
-				struct rpc_pipe_client **cli)
+NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain, struct rpc_pipe_client **cli)
 {
 	struct winbindd_cm_conn *conn;
 	NTSTATUS result;
@@ -1140,10 +1137,9 @@
 	   domain name in the net_req_auth2() request */
 
 	if ( IS_DC ) {
-		account_name = talloc_asprintf( mem_ctx, "%s$", lp_workgroup() );
+		account_name = lp_workgroup();
 	} else {
-		account_name = talloc_asprintf(mem_ctx, "%s$", 
-			domain->primary ?  global_myname() : domain->name);
+		account_name = domain->primary ? global_myname() : domain->name;
 	}
 
 	if (account_name == NULL) {

Modified: trunk/source/nsswitch/winbindd_misc.c
===================================================================
--- trunk/source/nsswitch/winbindd_misc.c	2005-09-16 16:42:40 UTC (rev 10271)
+++ trunk/source/nsswitch/winbindd_misc.c	2005-09-16 17:20:45 UTC (rev 10272)
@@ -59,7 +59,7 @@
 
 	{
 		struct rpc_pipe_client *netlogon_pipe;
-		result = cm_connect_netlogon(contact_domain, state->mem_ctx, &netlogon_pipe);
+		result = cm_connect_netlogon(contact_domain, &netlogon_pipe);
 	}
 
         if (!NT_STATUS_IS_OK(result)) {
@@ -174,7 +174,7 @@
 	DEBUG(3, ("[%5lu]: Get DC name for %s\n", (unsigned long)state->pid,
 		  state->request.domain_name));
 
-	result = cm_connect_netlogon(domain, state->mem_ctx, &netlogon_pipe);
+	result = cm_connect_netlogon(domain, &netlogon_pipe);
 
 	if (!NT_STATUS_IS_OK(result)) {
 		DEBUG(1, ("Can't contact our the NETLOGON pipe\n"));

Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c	2005-09-16 16:42:40 UTC (rev 10271)
+++ trunk/source/nsswitch/winbindd_pam.c	2005-09-16 17:20:45 UTC (rev 10272)
@@ -335,7 +335,7 @@
 		ZERO_STRUCT(info3);
 		retry = False;
 
-		result = cm_connect_netlogon(contact_domain, state->mem_ctx, &netlogon_pipe);
+		result = cm_connect_netlogon(contact_domain, &netlogon_pipe);
 
 		if (!NT_STATUS_IS_OK(result)) {
 			DEBUG(3, ("could not open handle to NETLOGON pipe\n"));
@@ -615,7 +615,7 @@
 		ZERO_STRUCT(info3);
 		retry = False;
 
-		result = cm_connect_netlogon(contact_domain, state->mem_ctx, &netlogon_pipe);
+		result = cm_connect_netlogon(contact_domain, &netlogon_pipe);
 
 		if (!NT_STATUS_IS_OK(result)) {
 			DEBUG(3, ("could not open handle to NETLOGON pipe (error: %s)\n",