diff options
| author | Gerald Carter <jerry@samba.org> | 2002-10-01 18:26:00 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-10-01 18:26:00 +0000 |
| commit | f2d1f19a66ebaf9b88d23c0faa2412536cc74cda (patch) | |
| tree | 781120ed548c3f38de9d40795a426de525e7865b /source3/libads/sasl.c | |
| parent | 2fb5c7c580a3fff3c7d477b65a1c4852af86433b (diff) | |
| download | samba-f2d1f19a66ebaf9b88d23c0faa2412536cc74cda.tar.gz samba-f2d1f19a66ebaf9b88d23c0faa2412536cc74cda.tar.xz samba-f2d1f19a66ebaf9b88d23c0faa2412536cc74cda.zip | |
syncing up with HEAD. Seems to be a lot of differences creeping in
(i ignored the new SAMBA stuff, but the rest of this looks like it should
have been merged already).
(This used to be commit 3de09e5cf1f667e410ee8b9516a956860ce7290f)
Diffstat (limited to 'source3/libads/sasl.c')
| -rw-r--r-- | source3/libads/sasl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index f7dd01084a2..aa7d99a5f7c 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -20,7 +20,7 @@ #include "includes.h" -#ifdef HAVE_ADS +#ifdef HAVE_LDAP /* perform a LDAP/SASL/SPNEGO/NTLMSSP bind (just how many layers can @@ -190,10 +190,12 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads) } DEBUG(3,("got principal=%s\n", principal)); +#ifdef HAVE_KRB5 if (!(ads->auth.flags & ADS_AUTH_DISABLE_KERBEROS) && got_kerberos_mechanism && ads_kinit_password(ads) == 0) { return ads_sasl_spnego_krb5_bind(ads, principal); } +#endif /* lets do NTLMSSP ... this has the big advantage that we don't need to sync clocks, and we don't rely on special versions of the krb5 |