diff options
| author | Luke Leighton <lkcl@samba.org> | 1998-11-12 16:07:00 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1998-11-12 16:07:00 +0000 |
| commit | 5b863af4c0179f0bee17e77690d99a54cc762531 (patch) | |
| tree | 516559fc7d6551e02bc6edf4089f0024c13cb127 /source3/rpc_server/srv_netlog.c | |
| parent | 1ab463a79575316612097445ea40b9dd7bcb84bd (diff) | |
| download | samba-5b863af4c0179f0bee17e77690d99a54cc762531.tar.gz samba-5b863af4c0179f0bee17e77690d99a54cc762531.tar.bz2 samba-5b863af4c0179f0bee17e77690d99a54cc762531.zip | |
cleaning up conflicts between group code not yet committed and
changes from yesterday by me, jeremy and andrew.
jeremy, your ACB_PWNOTREQ mod would have caused a crash if the user
didn't exist (first check should be for smb_pass != NULL)
(This used to be commit cbac0f165d351ba9497c222e55e453d781376e58)
Diffstat (limited to 'source3/rpc_server/srv_netlog.c')
| -rw-r--r-- | source3/rpc_server/srv_netlog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c index f93d09b3ba..04118800e2 100644 --- a/source3/rpc_server/srv_netlog.c +++ b/source3/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; } |