diff options
| author | Gerald Carter <jerry@samba.org> | 2005-06-08 14:57:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:57:08 -0500 |
| commit | dacdfbc98ccb533626058745f4aacef0b0b36286 (patch) | |
| tree | 3dff4571c0c2d4bec3ac86d2b4a5065b6504a3f1 /source3/smbd/sesssetup.c | |
| parent | 0da9b4b336a24c184f097b46a46ffd9585f4a710 (diff) | |
| download | samba-dacdfbc98ccb533626058745f4aacef0b0b36286.tar.gz samba-dacdfbc98ccb533626058745f4aacef0b0b36286.tar.bz2 samba-dacdfbc98ccb533626058745f4aacef0b0b36286.zip | |
r7398: commiting abartlet's patch for kerberos authentication when using a keytab and security != ads
(This used to be commit 3faaa5c3eb3b2057984586e069a47cb210c99140)
Diffstat (limited to 'source3/smbd/sesssetup.c')
| -rw-r--r-- | source3/smbd/sesssetup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 5808de9788..3b33db24e8 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -468,7 +468,7 @@ static int reply_spnego_negotiate(connection_struct *conn, DEBUG(3,("Got secblob of size %lu\n", (unsigned long)secblob.length)); #ifdef HAVE_KRB5 - if (got_kerberos_mechanism && (SEC_ADS == lp_security())) { + if ( got_kerberos_mechanism && ((lp_security()==SEC_ADS) || lp_use_kerberos_keytab()) ) { int ret = reply_spnego_kerberos(conn, inbuf, outbuf, length, bufsize, &secblob); data_blob_free(&secblob); |