From 725f6d04e01ec143daa67b838e8ae755b64d850e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 9 Apr 2001 20:50:59 +0000 Subject: [PATCH] some fixes from Andrew Bartlett --- source/passdb/smbpass.c | 5 ++++- source/rpc_server/srv_netlog_nt.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/passdb/smbpass.c b/source/passdb/smbpass.c index 6d4756643f9..34f083a0c2d 100644 --- a/source/passdb/smbpass.c +++ b/source/passdb/smbpass.c @@ -471,7 +471,10 @@ static struct sam_passwd* build_sampw_from_smbpw (struct smb_passwd *pw_buf) user.user_rid = pdb_uid_to_user_rid (user.smb_userid); user.group_rid = pdb_gid_to_group_rid(user.smb_grpid ); - pstrcpy(full_name , pwfile->pw_gecos ); + if (lp_unix_realname()) + pstrcpy(full_name, pwfile->pw_gecos); + else + pstrcpy(full_name , ""); pstrcpy(logon_script , lp_logon_script ()); pstrcpy(profile_path , lp_logon_path ()); pstrcpy(home_drive , lp_logon_drive ()); diff --git a/source/rpc_server/srv_netlog_nt.c b/source/rpc_server/srv_netlog_nt.c index b6a03755390..3f6bbe8f6f8 100644 --- a/source/rpc_server/srv_netlog_nt.c +++ b/source/rpc_server/srv_netlog_nt.c @@ -421,7 +421,7 @@ static uint32 net_login_network(NET_ID_INFO_2 *id2, struct smb_passwd *smb_pass) if(smb_password_check((char *)id2->nt_chal_resp.buffer, smb_pass->smb_nt_passwd, id2->lm_chal)) - return 0x0; + return NT_STATUS_NO_PROBLEMO; else return NT_STATUS_WRONG_PASSWORD; } @@ -439,7 +439,7 @@ static uint32 net_login_network(NET_ID_INFO_2 *id2, struct smb_passwd *smb_pass) smb_pass->smb_passwd, id2->lm_chal)) { - return 0x0; + return NT_STATUS_NO_PROBLEMO; } -- 2.11.4.GIT