diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2001-09-23 05:16:03 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2001-09-23 05:16:03 +0000 |
| commit | 4eb7ef6b612a98e1d71a2a0dfde7d695223a4360 (patch) | |
| tree | 7c3c5448d705d22d3815a0d1656ced5572b68e08 /source3/smbd | |
| parent | b192746e77ac610e5de7e0ee62c8c79a7dce9c40 (diff) | |
| download | samba-4eb7ef6b612a98e1d71a2a0dfde7d695223a4360.tar.gz samba-4eb7ef6b612a98e1d71a2a0dfde7d695223a4360.tar.bz2 samba-4eb7ef6b612a98e1d71a2a0dfde7d695223a4360.zip | |
Fix up NT_STATUS return for session setups, Win2k objects to anything other
than NT_STATUS_LOGON_FAILURE. This also brings us (almost) back in line with
their implementation.
Kill off SMBENCRYPT() macro
Kill off 'nt smb support' paramater - tridge okayed this one.
Andrew Bartlett
(This used to be commit 67947bf6e31ee9758f8a2186f83031ba21b716f2)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/negprot.c | 10 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 9ebb0b7350..b065cab53e 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -66,7 +66,7 @@ static int reply_lanman1(char *outbuf) { int raw = (lp_readraw()?1:0) | (lp_writeraw()?2:0); int secword=0; - BOOL doencrypt = SMBENCRYPT(); + BOOL doencrypt = lp_encrypted_passwords(); time_t t = time(NULL); if (lp_security()>=SEC_USER) secword |= 1; @@ -103,7 +103,7 @@ static int reply_lanman2(char *outbuf) { int raw = (lp_readraw()?1:0) | (lp_writeraw()?2:0); int secword=0; - BOOL doencrypt = SMBENCRYPT(); + BOOL doencrypt = lp_encrypted_passwords(); time_t t = time(NULL); struct cli_state *cli = NULL; char cryptkey[8]; @@ -162,7 +162,7 @@ static int reply_nt1(char *outbuf) CAP_LEVEL_II_OPLOCKS|CAP_STATUS32; int secword=0; - BOOL doencrypt = SMBENCRYPT(); + BOOL doencrypt = lp_encrypted_passwords(); time_t t = time(NULL); struct cli_state *cli = NULL; char cryptkey[8]; @@ -193,9 +193,7 @@ static int reply_nt1(char *outbuf) } } - if (lp_nt_smb_support()) { - capabilities |= CAP_NT_SMBS|CAP_RPC_REMOTE_APIS; - } + capabilities |= CAP_NT_SMBS|CAP_RPC_REMOTE_APIS; if (lp_large_readwrite() && (SMB_OFF_T_BITS == 64)) { capabilities |= CAP_LARGE_READX|CAP_LARGE_WRITEX|CAP_W2K_SMBS; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index e3c7c9b856..64662a54e2 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -496,7 +496,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int fstring native_lanman; BOOL guest=False; static BOOL done_sesssetup = False; - BOOL doencrypt = SMBENCRYPT(); + BOOL doencrypt = lp_encrypted_passwords(); START_PROFILE(SMBsesssetupX); *smb_apasswd = 0; @@ -745,8 +745,8 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int guest = True; } else { - return ERROR_NT(nt_status); - } + return ERROR_NT(NT_STATUS_LOGON_FAILURE); + } } if (!strequal(user,lp_guestaccount(-1)) && |