diff options
| author | Gerald Carter <jerry@samba.org> | 2007-09-28 18:15:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:03 -0500 |
| commit | 5221ebb299081da6a806362212c6a8ceb9cc70a8 (patch) | |
| tree | 40822494127c0bebd85a6db2c27115e923e91ae8 /source3/libads/sasl.c | |
| parent | 58a9621904f0334d8f5a1f34e2dfd95409e7c68d (diff) | |
| download | samba-5221ebb299081da6a806362212c6a8ceb9cc70a8.tar.gz samba-5221ebb299081da6a806362212c6a8ceb9cc70a8.tar.xz samba-5221ebb299081da6a806362212c6a8ceb9cc70a8.zip | |
r25407: Revert Longhorn join patch as it is not correct for the 3.2 tree.
The translate_name() used by cli_session_setup_spnego() cann rely
Winbindd since it is needed by the join process (and hence before
Winbind can be run).
(This used to be commit 00a93ed336c5f36643e6e33bd277608eaf05677c)
Diffstat (limited to 'source3/libads/sasl.c')
| -rw-r--r-- | source3/libads/sasl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index 590052ec85..dec8756a86 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -747,7 +747,6 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads) char *OIDs[ASN1_MAX_OIDS]; #ifdef HAVE_KRB5 BOOL got_kerberos_mechanism = False; - BOOL try_kerberos = True; #endif rc = ldap_sasl_bind_s(ads->ldap.ld, NULL, "GSS-SPNEGO", NULL, NULL, NULL, &scred); @@ -785,8 +784,7 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads) #endif free(OIDs[i]); } - DEBUG(3,("ads_sasl_spnego_bind: got server principal name = %s\n", - (given_principal ? given_principal : NULL))); + DEBUG(3,("ads_sasl_spnego_bind: got server principal name = %s\n", given_principal)); #ifdef HAVE_KRB5 if (!(ads->auth.flags & ADS_AUTH_DISABLE_KERBEROS) && |