diff options
| author | Jim McDonough <jmcd@samba.org> | 2002-08-16 08:09:55 +0000 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2002-08-16 08:09:55 +0000 |
| commit | 51f62926b3bae5b20dc7610b8261431f2d4d4a84 (patch) | |
| tree | bfddb5bb0ec69473a15ce0b48f9aeb82beda20d7 /source3 | |
| parent | b92cda9772a23a7d46171144b1f0af860142e590 (diff) | |
| download | samba-51f62926b3bae5b20dc7610b8261431f2d4d4a84.tar.gz samba-51f62926b3bae5b20dc7610b8261431f2d4d4a84.tar.bz2 samba-51f62926b3bae5b20dc7610b8261431f2d4d4a84.zip | |
Re-add the last empty item to the NTLMSSP info list, but this time do it
with an empty string, not a NULL pointer...
Also, check for security=ads before giving a kerberos spnego response.
(This used to be commit 6eca417d1c29c7c18455f8290cad86fb1444e615)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/sesssetup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 78dd66a018..8fb5a50697 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -266,7 +266,7 @@ static int reply_spnego_negotiate(connection_struct *conn, DEBUG(3,("Got secblob of size %d\n", secblob.length)); #ifdef HAVE_KRB5 - if (got_kerberos) { + if (got_kerberos && (SEC_ADS == lp_security())) { int ret = reply_spnego_kerberos(conn, inbuf, outbuf, length, bufsize, &secblob); data_blob_free(&secblob); @@ -332,11 +332,12 @@ static int reply_spnego_negotiate(connection_struct *conn, fstrcat(dnsname, lp_realm()); strlower(dnsname); - msrpc_gen(&struct_blob, "aaaa", + msrpc_gen(&struct_blob, "aaaaa", 2, lp_workgroup(), 1, global_myname, 4, dnsdomname, - 3, dnsname); + 3, dnsname, + 0, ""); msrpc_gen(&chal, "CdUdbddB", "NTLMSSP", |