diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_err.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c index c7f871ec3a..92014b2ba1 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c +++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c @@ -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 @@ krb5_ldap_db_init(krb5_context context, krb5_ldap_context *ldap_context) #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) diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_err.c b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_err.c index 610e75f7a2..268698913d 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_err.c +++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_err.c @@ -1,6 +1,4 @@ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <ldap.h> #include <errno.h> /* Solaris Kerberos: errors are handled diff from MIT */ @@ -135,6 +133,8 @@ int translate_ldap_error(int err, int op) { 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: |