diff options
| author | Julian Pullen <Julian.Pullen@Sun.COM> | 2010-07-14 15:16:32 +0100 |
|---|---|---|
| committer | Julian Pullen <Julian.Pullen@Sun.COM> | 2010-07-14 15:16:32 +0100 |
| commit | 442384bb4f40e4893df0a79549264f04218e1d9f (patch) | |
| tree | 2fb884084ae00f34ea056bb28958668f46199413 /usr/src/lib/libsldap/common/ns_connect.c | |
| parent | 2edb3dcc4f69d09d0b5a60ef77640285ed90e8b5 (diff) | |
| download | illumos-gate-442384bb4f40e4893df0a79549264f04218e1d9f.tar.gz | |
6786011 LDAP SASL bind operation should not disable metaslot globally
Diffstat (limited to 'usr/src/lib/libsldap/common/ns_connect.c')
| -rw-r--r-- | usr/src/lib/libsldap/common/ns_connect.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/usr/src/lib/libsldap/common/ns_connect.c b/usr/src/lib/libsldap/common/ns_connect.c index 5e3ad10bf7..aa7a7a5e19 100644 --- a/usr/src/lib/libsldap/common/ns_connect.c +++ b/usr/src/lib/libsldap/common/ns_connect.c @@ -20,8 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. */ #include <stdlib.h> @@ -2548,19 +2547,6 @@ doSASLBind(const ns_cred_t *auth, free(digest_md5_name); break; case NS_LDAP_SASL_GSSAPI: - if (sasl_gssapi_inited == 0) { - ret_code = __s_api_sasl_gssapi_init(); - if (ret_code != NS_LDAP_SUCCESS) { - (void) snprintf(errstr, sizeof (errstr), - gettext("openConnection: " - "GSSAPI initialization " - "failed")); - (void) ldap_unbind(ld); - MKERROR(LOG_WARNING, *errorp, ret_code, - strdup(errstr), NS_LDAP_MEMORY); - return (ret_code); - } - } (void) memset(&sasl_param, 0, sizeof (ns_sasl_cb_param_t)); sasl_param.authid = NULL; |