diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-02-09 03:04:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:53 -0500 |
| commit | 941c1566e514ef039220a781e12ce9385265071a (patch) | |
| tree | 0fac2f8fed238b51e325eb21e97d8be8c9bdec7f /source4/smb_server/smb/sesssetup.c | |
| parent | 5cecce1761c06b0641190cf7bb8e93bff9a88cf4 (diff) | |
| download | samba-941c1566e514ef039220a781e12ce9385265071a.tar.gz samba-941c1566e514ef039220a781e12ce9385265071a.tar.bz2 samba-941c1566e514ef039220a781e12ce9385265071a.zip | |
r13403: Try to better handle a case where SPNEGO isn't available (allow us to
emulate the behaviour of XP standalone if required).
Andrew Bartlett
(This used to be commit 7f821097fbdbc9f35d96e05f85cf008f36c0eea3)
Diffstat (limited to 'source4/smb_server/smb/sesssetup.c')
| -rw-r--r-- | source4/smb_server/smb/sesssetup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c index 225f0f7c47..a90f709a12 100644 --- a/source4/smb_server/smb/sesssetup.c +++ b/source4/smb_server/smb/sesssetup.c @@ -149,7 +149,7 @@ static NTSTATUS sesssetup_nt1(struct smbsrv_request *req, union smb_sesssetup *s req->smb_conn->negotiate.client_caps = sess->nt1.in.capabilities; } - if (req->smb_conn->negotiate.spnego_negotiated) { + if (req->smb_conn->negotiate.oid) { if (sess->nt1.in.user && *sess->nt1.in.user) { /* We can't accept a normal login, because we * don't have a challenge */ @@ -294,9 +294,10 @@ static NTSTATUS sesssetup_spnego(struct smbsrv_request *req, union smb_sesssetup gensec_want_feature(gensec_ctx, GENSEC_FEATURE_SESSION_KEY); - status = gensec_start_mech_by_oid(gensec_ctx, GENSEC_OID_SPNEGO); + status = gensec_start_mech_by_oid(gensec_ctx, req->smb_conn->negotiate.oid); if (!NT_STATUS_IS_OK(status)) { - DEBUG(1, ("Failed to start GENSEC SPNEGO server code: %s\n", nt_errstr(status))); + DEBUG(1, ("Failed to start GENSEC %s server code: %s\n", + gensec_get_name_by_oid(req->smb_conn->negotiate.oid), nt_errstr(status))); return status; } |