svn commit: samba r15923 - in trunk/source: include rpc_server

[vlendec at samba.org]

Author: vlendec
Date: 2006-05-28 15:47:26 +0000 (Sun, 28 May 2006)
New Revision: 15923

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

Log:
The "Windows user info" in pipes_struct is not used anywhere, so I don't think
there's a point in keeping it.

Volker

Modified:
   trunk/source/include/ntdomain.h
   trunk/source/rpc_server/srv_pipe.c


Changeset:
Modified: trunk/source/include/ntdomain.h
===================================================================
--- trunk/source/include/ntdomain.h	2006-05-28 15:20:53 UTC (rev 15922)
+++ trunk/source/include/ntdomain.h	2006-05-28 15:47:26 UTC (rev 15923)
@@ -234,13 +234,6 @@
 	struct dcinfo *dc; /* Keeps the creds data from netlogon. */
 
 	/*
-	 * Windows user info.
-	 */
-	fstring user_name;
-	fstring domain;
-	fstring wks;
-
-	/*
 	 * Unix user name and credentials used when a pipe is authenticated.
 	 */
 

Modified: trunk/source/rpc_server/srv_pipe.c
===================================================================
--- trunk/source/rpc_server/srv_pipe.c	2006-05-28 15:20:53 UTC (rev 15922)
+++ trunk/source/rpc_server/srv_pipe.c	2006-05-28 15:47:26 UTC (rev 15923)
@@ -610,11 +610,6 @@
 
 	ZERO_STRUCT(reply);
 
-	memset(p->user_name, '\0', sizeof(p->user_name));
-	memset(p->pipe_user_name, '\0', sizeof(p->pipe_user_name));
-	memset(p->domain, '\0', sizeof(p->domain));
-	memset(p->wks, '\0', sizeof(p->wks));
-
 	/* Set up for non-authenticated user. */
 	TALLOC_FREE(p->pipe_user.nt_user_token);
 	p->pipe_user.ut.ngroups = 0;
@@ -650,13 +645,9 @@
 		}
 	}
 	
-	fstrcpy(p->user_name, a->ntlmssp_state->user);
-	fstrcpy(p->pipe_user_name, a->server_info->unix_name);
-	fstrcpy(p->domain, a->ntlmssp_state->domain);
-	fstrcpy(p->wks, a->ntlmssp_state->workstation);
-
 	DEBUG(5,("pipe_ntlmssp_verify_final: OK: user: %s domain: %s workstation: %s\n",
-		p->user_name, p->domain, p->wks));
+		 a->ntlmssp_state->user, a->ntlmssp_state->domain,
+		 a->ntlmssp_state->workstation));
 
 	/*
 	 * Store the UNIX credential data (uid/gid pair) in the pipe structure.