svn commit: samba r11070 - in branches/SAMBA_4_0/source/winbind: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-10-14 21:41:08 +0000 (Fri, 14 Oct 2005)
New Revision: 11070

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

Log:
Fix a cut&paste error, now wbinfo can properly separate domain and user...

Volker

Modified:
   branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c
   branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c


Changeset:
Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2005-10-14 21:09:56 UTC (rev 11069)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2005-10-14 21:41:08 UTC (rev 11070)
@@ -183,6 +183,7 @@
 	return NT_STATUS_OK;
 }
 
+#if 0
 static BOOL samba3_parse_domuser(TALLOC_CTX *mem_ctx, const char *domuser,
 				 char **domain, char **user)
 {
@@ -200,6 +201,7 @@
 
 	return ((*domain != NULL) && (*user != NULL));
 }
+#endif
 
 static void pam_auth_crap_recv(struct composite_context *ctx);
 
@@ -208,7 +210,6 @@
 	struct composite_context *ctx;
 
 	DATA_BLOB chal, nt_resp, lm_resp;
-	char *domain, *user;
 
 	DEBUG(5, ("wbsrv_samba3_pam_auth_crap called\n"));
 
@@ -219,13 +220,10 @@
 	lm_resp.data   = s3call->request.data.auth_crap.lm_resp;
 	lm_resp.length = s3call->request.data.auth_crap.lm_resp_len;
 
-	if (!samba3_parse_domuser(s3call, s3call->request.data.auth_crap.user,
-				  &domain, &user)) {
-		return NT_STATUS_NO_MEMORY;
-	}
-
 	ctx = wb_cmd_pam_auth_crap_send(
-		s3call->call, domain, user,
+		s3call->call, 
+		s3call->request.data.auth_crap.domain,
+		s3call->request.data.auth_crap.user,
 		s3call->request.data.auth_crap.workstation,
 		chal, nt_resp, lm_resp);
 	NT_STATUS_HAVE_NO_MEMORY(ctx);

Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c	2005-10-14 21:09:56 UTC (rev 11069)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c	2005-10-14 21:41:08 UTC (rev 11070)
@@ -80,7 +80,7 @@
 		return wbsrv_samba3_ping(s3call);
 
 	case WINBINDD_INFO:
-		return wbsrv_samba3_domain_name(s3call);
+		return wbsrv_samba3_info(s3call);
 
 	case WINBINDD_DOMAIN_NAME:
 		return wbsrv_samba3_domain_name(s3call);