cleaning up conflicts between group code not yet committed and

[samba.git] / source / rpc_server / srv_netlog.c

diff --git a/source/rpc_server/srv_netlog.c b/source/rpc_server/srv_netlog.c
index f93d09b3ba91f1eccba258291e4c4c0d35f026ae..04118800e2e7018e7b963acffae211e5f0aa7085 100644 (file)
--- a/source/rpc_server/srv_netlog.c
+++ b/source/rpc_server/srv_netlog.c
@@ -673,10 +673,10 @@ static void api_net_sam_logon( uint16 vuid,
     smb_pass = getsmbpwnam(samlogon_user);
     unbecome_root(True);
 
-    if (smb_pass->acct_ctrl & ACB_PWNOTREQ)
-      status = 0;
-    else if (smb_pass == NULL)
+    if (smb_pass == NULL)
       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+    else if (smb_pass->acct_ctrl & ACB_PWNOTREQ)
+      status = 0;
     else if (smb_pass->acct_ctrl & ACB_DISABLED)
       status =  0xC0000000 | NT_STATUS_ACCOUNT_DISABLED;
   }