Mercurial > illumos > illumos-gate
changeset 9978:ce23a6a98c42
6835384 KDC doesn't rebind after rebooted LDAP server
6848169 fix for kdb ldap plugin timeout incomplete, still using 10ms, should be 1s
| author | Will Fiveash <Will.Fiveash@Sun.COM> |
|---|---|
| date | Fri, 26 Jun 2009 12:35:29 -0500 |
| parents | 17b7501a895e |
| children | 006c3455a081 |
| files | usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_err.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c Fri Jun 26 02:36:13 2009 -0700 +++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c Fri Jun 26 12:35:29 2009 -0500 @@ -1,5 +1,5 @@ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -277,7 +277,7 @@ #ifdef LDAP_OPT_NETWORK_TIMEOUT struct timeval local_timelimit = {10,0}; #elif defined LDAP_X_OPT_CONNECT_TIMEOUT - int local_timelimit = 10; + int local_timelimit = 1000; /* Solaris Kerberos: 1 second */ #endif if ((st=krb5_validate_ldap_context(context, ldap_context)) != 0)
--- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_err.c Fri Jun 26 02:36:13 2009 -0700 +++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_err.c Fri Jun 26 12:35:29 2009 -0500 @@ -1,5 +1,3 @@ - -#pragma ident "%Z%%M% %I% %E% SMI" #include <ldap.h> #include <errno.h> @@ -135,6 +133,8 @@ case LDAP_INAPPROPRIATE_AUTH: case LDAP_INVALID_CREDENTIALS: case LDAP_UNAVAILABLE: + case LDAP_SERVER_DOWN: /* Solaris Kerberos */ + case LDAP_CONNECT_ERROR: /* Solaris Kerberos */ return KRB5_KDB_ACCESS_ERROR; case LDAP_STRONG_AUTH_REQUIRED: