diff options
| author | Jeremy Allison <jra@samba.org> | 1998-06-29 22:50:49 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-06-29 22:50:49 +0000 |
| commit | 4ab3d1682789319965a55edb37212b7671a743bb (patch) | |
| tree | fe8317ae6ed3abd88ed532e213a865a503879c3e /source/rpc_server/srv_netlog.c | |
| parent | a38d903d2016202d470f1405e593be3c20404d72 (diff) | |
| download | samba-4ab3d1682789319965a55edb37212b7671a743bb.tar.gz samba-4ab3d1682789319965a55edb37212b7671a743bb.tar.xz samba-4ab3d1682789319965a55edb37212b7671a743bb.zip | |
nmbd_elections.c: Removed force elections code to bring into line with 1.9.18.
nmbd_namelistdb.c: Added comment for Chris.
nmbd_subnetdb.c: Went back to Chris's comparison code as with the make_nmb_name
change it all works now.
lib/rpc/server/srv_netlog.c: Ensure we return 'account disabled' for disabled
accounts, rather than crashing.
Jeremy.
Diffstat (limited to 'source/rpc_server/srv_netlog.c')
| -rw-r--r-- | source/rpc_server/srv_netlog.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/rpc_server/srv_netlog.c b/source/rpc_server/srv_netlog.c index 8bcf1682bcb..cb22cfddf02 100644 --- a/source/rpc_server/srv_netlog.c +++ b/source/rpc_server/srv_netlog.c @@ -252,7 +252,8 @@ static BOOL get_md4pw(char *md4pw, char *mach_name, char *mach_acct) smb_pass = getsmbpwnam(mach_acct); unbecome_root(True); - if (smb_pass != NULL) + if ((smb_pass) != NULL && !(smb_pass->acct_ctrl & ACB_DISABLED) && + (smb_pass->smb_nt_passwd != NULL)) { memcpy(md4pw, smb_pass->smb_nt_passwd, 16); dump_data(5, md4pw, 16); @@ -656,9 +657,9 @@ static void api_net_sam_logon( int uid, unbecome_root(True); if (smb_pass == NULL) - { status = 0xC0000000 | NT_STATUS_NO_SUCH_USER; - } + else if (smb_pass->acct_ctrl & ACB_DISABLED) + status = 0xC0000000 | NT_STATUS_ACCOUNT_DISABLED; } /* validate password. */ |