mirror of
https://github.com/samba-team/samba.git
synced 2024-12-27 03:21:53 +03:00
Move the test for non-SPNEGO session setups when using SPNEGO, becouse its a
perfectly vailid behaviour for guest logins.
(This used to be commit 4db8d70ad7
)
This commit is contained in:
parent
015aa4244b
commit
fdc03603c1
@ -496,11 +496,6 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
|
||||
return reply_sesssetup_and_X_spnego(conn, inbuf, outbuf, length, bufsize);
|
||||
}
|
||||
|
||||
if (global_spnego_negotiated) {
|
||||
DEBUG(0,("reply_sesssetup_and_X: Rejecting attempt at 'normal' session setup after negotiating spnego.\n"));
|
||||
return ERROR_NT(NT_STATUS_UNSUCCESSFUL);
|
||||
}
|
||||
|
||||
smb_bufsize = SVAL(inbuf,smb_vwv2);
|
||||
|
||||
if (Protocol < PROTOCOL_NT1) {
|
||||
@ -635,6 +630,11 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
|
||||
if (!*user) {
|
||||
pstrcpy(user,lp_guestaccount(-1));
|
||||
guest = True;
|
||||
} else {
|
||||
if (global_spnego_negotiated) {
|
||||
DEBUG(0,("reply_sesssetup_and_X: Rejecting attempt at 'normal' session setup after negotiating spnego.\n"));
|
||||
return ERROR_NT(NT_STATUS_UNSUCCESSFUL);
|
||||
}
|
||||
}
|
||||
|
||||
pstrcpy(current_user_info.smb_name,user);
|
||||
|
Loading…
Reference in New Issue
Block a user