sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

- accept either NT or lanman passwords in tconX

Browse Source
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent 203f49a4e2
commit b6c1c60d72
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/smbd/password.c
View File

@ -597,7 +597,7 @@ BOOL smb_password_check(char *password, unsigned char *part_passwd, unsigned cha
/**************************************************************************** /****************************************************************************
check if a username/password is OK check if a username/password is OK
****************************************************************************/ ****************************************************************************/
BOOL password_ok(char *user,char *password, int pwlen, struct passwd *pwd, BOOL is_nt_password) BOOL password_ok(char *user,char *password, int pwlen, struct passwd *pwd)
{ {
pstring pass2; pstring pass2;
int level = lp_passwordlevel(); int level = lp_passwordlevel();
@ -672,7 +672,7 @@ BOOL password_ok(char *user,char *password, int pwlen, struct passwd *pwd, BOOL
return(False); return(False);
} }
if(Protocol >= PROTOCOL_NT1 && is_nt_password) if(Protocol >= PROTOCOL_NT1)
{ {
/* We have the NT MD4 hash challenge available - see if we can /* We have the NT MD4 hash challenge available - see if we can
use it (ie. does it exist in the smbpasswd file). use it (ie. does it exist in the smbpasswd file).
@ -688,7 +688,6 @@ BOOL password_ok(char *user,char *password, int pwlen, struct passwd *pwd, BOOL
return(True); return(True);
} }
DEBUG(4,("NT MD4 password check failed\n")); DEBUG(4,("NT MD4 password check failed\n"));
return (False);
} }
} }
@ -888,7 +887,7 @@ static char *validate_group(char *group,char *password,int pwlen,int snum)
while (getnetgrent(&host, &user, &domain)) { while (getnetgrent(&host, &user, &domain)) {
if (user) { if (user) {
if (user_ok(user, snum) && if (user_ok(user, snum) &&
password_ok(user,password,pwlen,NULL,False)) { password_ok(user,password,pwlen,NULL)) {
endnetgrent(); endnetgrent();
return(user); return(user);
} }
@ -910,7 +909,7 @@ static char *validate_group(char *group,char *password,int pwlen,int snum)
static fstring name; static fstring name;
strcpy(name,*member); strcpy(name,*member);
if (user_ok(name,snum) && if (user_ok(name,snum) &&
password_ok(name,password,pwlen,NULL,False)) password_ok(name,password,pwlen,NULL))
return(&name[0]); return(&name[0]);
member++; member++;
} }
@ -923,7 +922,7 @@ static char *validate_group(char *group,char *password,int pwlen,int snum)
while (pwd = getpwent ()) { while (pwd = getpwent ()) {
if (*(pwd->pw_passwd) && pwd->pw_gid == gptr->gr_gid) { if (*(pwd->pw_passwd) && pwd->pw_gid == gptr->gr_gid) {
/* This Entry have PASSWORD and same GID then check pwd */ /* This Entry have PASSWORD and same GID then check pwd */
if (password_ok(NULL, password, pwlen, pwd,False)) { if (password_ok(NULL, password, pwlen, pwd)) {
strcpy(tm, pwd->pw_name); strcpy(tm, pwd->pw_name);
endpwent (); endpwent ();
return tm; return tm;
@ -974,14 +973,14 @@ BOOL authorise_login(int snum,char *user,char *password, int pwlen,
/* check the given username and password */ /* check the given username and password */
if (!ok && (*user) && user_ok(user,snum)) { if (!ok && (*user) && user_ok(user,snum)) {
ok = password_ok(user,password, pwlen, NULL, False); ok = password_ok(user,password, pwlen, NULL);
if (ok) DEBUG(3,("ACCEPTED: given username password ok\n")); if (ok) DEBUG(3,("ACCEPTED: given username password ok\n"));
} }
/* check for a previously registered guest username */ /* check for a previously registered guest username */
if (!ok && (vuid >= 0) && validated_users[vuid].guest) { if (!ok && (vuid >= 0) && validated_users[vuid].guest) {
if (user_ok(validated_users[vuid].name,snum) && if (user_ok(validated_users[vuid].name,snum) &&
password_ok(validated_users[vuid].name, password, pwlen, NULL, False)) { password_ok(validated_users[vuid].name, password, pwlen, NULL)) {
strcpy(user, validated_users[vuid].name); strcpy(user, validated_users[vuid].name);
validated_users[vuid].guest = False; validated_users[vuid].guest = False;
DEBUG(3,("ACCEPTED: given password with registered user %s\n", user)); DEBUG(3,("ACCEPTED: given password with registered user %s\n", user));
@ -1005,7 +1004,7 @@ BOOL authorise_login(int snum,char *user,char *password, int pwlen,
strcpy(user2,auser); strcpy(user2,auser);
if (!user_ok(user2,snum)) continue; if (!user_ok(user2,snum)) continue;
if (password_ok(user2,password, pwlen, NULL, False)) { if (password_ok(user2,password, pwlen, NULL)) {
ok = True; ok = True;
strcpy(user,user2); strcpy(user,user2);
DEBUG(3,("ACCEPTED: session list username and given password ok\n")); DEBUG(3,("ACCEPTED: session list username and given password ok\n"));
@ -1057,7 +1056,7 @@ BOOL authorise_login(int snum,char *user,char *password, int pwlen,
fstring user2; fstring user2;
strcpy(user2,auser); strcpy(user2,auser);
if (user_ok(user2,snum) && if (user_ok(user2,snum) &&
password_ok(user2,password,pwlen,NULL, False)) password_ok(user2,password,pwlen,NULL))
{ {
ok = True; ok = True;
strcpy(user,user2); strcpy(user,user2);