diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-08-20 21:11:55 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-08-20 21:11:55 +0000 |
| commit | f9ce2028104fcb1694bc3e8f8d4b7ac3ec8c972e (patch) | |
| tree | 85c4e307b3997284ec4aca1a79ebfb2ada61bf94 /source3 | |
| parent | 4294f6f2c80cb81fdf872bee87e171640e3601fe (diff) | |
| download | samba-f9ce2028104fcb1694bc3e8f8d4b7ac3ec8c972e.tar.gz samba-f9ce2028104fcb1694bc3e8f8d4b7ac3ec8c972e.tar.bz2 samba-f9ce2028104fcb1694bc3e8f8d4b7ac3ec8c972e.zip | |
two fixes for NT clients -> share level Samba server
(This used to be commit a25911d58c752350b62b205cfb0d6fc5b1c90cef)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/auth/auth.c | 3 | ||||
| -rw-r--r-- | source3/smbd/auth.c | 3 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c index bbcf34e8ca..cb0d54bf9b 100644 --- a/source3/auth/auth.c +++ b/source3/auth/auth.c @@ -157,7 +157,8 @@ uint32 pass_check_smb_with_chal(char *user, char *domain, uchar chal[8], memcpy(user_info.chal, chal, 8); - if (lm_pwd_len >= 24 || (lp_encrypted_passwords() && (lm_pwd_len == 0) && lp_null_passwords())) { + if ((lm_pwd_len >= 24 || nt_pwd_len >= 24) || + (lp_encrypted_passwords() && (lm_pwd_len == 0) && lp_null_passwords())) { /* if 24 bytes long assume it is an encrypted password */ user_info.lm_resp.buffer = (uint8 *)lm_pwd; diff --git a/source3/smbd/auth.c b/source3/smbd/auth.c index bbcf34e8ca..cb0d54bf9b 100644 --- a/source3/smbd/auth.c +++ b/source3/smbd/auth.c @@ -157,7 +157,8 @@ uint32 pass_check_smb_with_chal(char *user, char *domain, uchar chal[8], memcpy(user_info.chal, chal, 8); - if (lm_pwd_len >= 24 || (lp_encrypted_passwords() && (lm_pwd_len == 0) && lp_null_passwords())) { + if ((lm_pwd_len >= 24 || nt_pwd_len >= 24) || + (lp_encrypted_passwords() && (lm_pwd_len == 0) && lp_null_passwords())) { /* if 24 bytes long assume it is an encrypted password */ user_info.lm_resp.buffer = (uint8 *)lm_pwd; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index ee71854687..eb97382750 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -632,7 +632,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int passlen1 = MIN(passlen1, MAX_PASS_LEN); passlen2 = MIN(passlen2, MAX_PASS_LEN); - if(!doencrypt) { + if (!doencrypt) { /* both Win95 and WinNT stuff up the password lengths for non-encrypting systems. Uggh. @@ -716,6 +716,14 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int return bad_password_error(inbuf, outbuf); } + if (lp_security() == SEC_SHARE) { + /* in share level we should ignore any passwords */ + smb_ntpasslen = 0; + smb_apasslen = 0; + guest = True; + } + + DEBUG(3,("sesssetupX:name=[%s]\n",user)); /* If name ends in $ then I think it's asking about whether a */ |