svn commit: samba r9243 - in trunk/source/rpc_server: .

[jmcd at samba.org]

Author: jmcd
Date: 2005-08-11 19:46:19 +0000 (Thu, 11 Aug 2005)
New Revision: 9243

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

Log:
Fix my fix for #2953.  I'd moved too much code until after we verify the user,
causing netlogon to return an invalid response for failed interactive logons.

Modified:
   trunk/source/rpc_server/srv_netlog_nt.c


Changeset:
Modified: trunk/source/rpc_server/srv_netlog_nt.c
===================================================================
--- trunk/source/rpc_server/srv_netlog_nt.c	2005-08-11 19:45:53 UTC (rev 9242)
+++ trunk/source/rpc_server/srv_netlog_nt.c	2005-08-11 19:46:19 UTC (rev 9243)
@@ -606,6 +606,9 @@
 	if (!(p->dc.authenticated && deal_with_creds(p->dc.sess_key, &p->dc.clnt_cred, &q_u->sam_id.client.cred, &srv_cred)))
 		return NT_STATUS_INVALID_HANDLE;
 
+	r_u->buffer_creds = 1; /* yes, we have valid server credentials */
+	memcpy(&r_u->srv_creds, &srv_cred, sizeof(r_u->srv_creds));
+
 	/* find the username */
     
 	switch (q_u->sam_id.logon_level) {
@@ -723,9 +726,6 @@
 	reseed_client_creds(&p->dc.clnt_cred, &q_u->sam_id.client.cred);
 	memcpy(&p->dc.srv_cred, &p->dc.clnt_cred, sizeof(p->dc.clnt_cred));
     
-	r_u->buffer_creds = 1; /* yes, we have valid server credentials */
-	memcpy(&r_u->srv_creds, &srv_cred, sizeof(r_u->srv_creds));
-
 	if (server_info->guest) {
 		/* We don't like guest domain logons... */
 		DEBUG(5,("_net_sam_logon: Attempted domain logon as GUEST denied.\n"));