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 | 6eca417d1c29c7c18455f8290cad86fb1444e615 (patch) | |
| tree | 6856fe35d908d8995b96717a8df8466e43871c24 /source | |
| parent | 23f332178526877e9670515eb7c614b81fca21a9 (diff) | |
| download | samba-6eca417d1c29c7c18455f8290cad86fb1444e615.tar.gz samba-6eca417d1c29c7c18455f8290cad86fb1444e615.tar.xz samba-6eca417d1c29c7c18455f8290cad86fb1444e615.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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/smbd/sesssetup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c index 78dd66a018b..8fb5a50697b 100644 --- a/source/smbd/sesssetup.c +++ b/source/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", |