diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/kdb/db2/kdb_db2.c | 52 | ||||
| -rw-r--r-- | src/plugins/kdb/db2/kdb_db2.h | 2 |
2 files changed, 19 insertions, 35 deletions
diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c index e85ce4be1..87b6c182b 100644 --- a/src/plugins/kdb/db2/kdb_db2.c +++ b/src/plugins/kdb/db2/kdb_db2.c @@ -405,13 +405,11 @@ ctx_unlock(krb5_context context, krb5_db2_context *dbc) return retval; } -#define MAX_LOCK_TRIES 5 - static krb5_error_code ctx_lock(krb5_context context, krb5_db2_context *dbc, int lockmode) { krb5_error_code retval; - int kmode, tries; + int kmode; if (lockmode == KRB5_DB_LOCKMODE_PERMANENT || lockmode == KRB5_DB_LOCKMODE_EXCLUSIVE) @@ -423,20 +421,12 @@ ctx_lock(krb5_context context, krb5_db2_context *dbc, int lockmode) if (dbc->db_locks_held == 0 || dbc->db_lock_mode < kmode) { /* Acquire or upgrade the lock. */ - for (tries = 0; tries < MAX_LOCK_TRIES; tries++) { - retval = krb5_lock_file(context, dbc->db_lf_file, - kmode | KRB5_LOCKMODE_DONTBLOCK); - if (retval == 0) - break; - if (retval == EBADF && kmode == KRB5_LOCKMODE_EXCLUSIVE) - /* Tried to lock something we don't have write access to. */ - return KRB5_KDB_CANTLOCK_DB; - sleep(1); - } - if (retval == EACCES) + retval = krb5_lock_file(context, dbc->db_lf_file, kmode); + /* Check if we tried to lock something not open for write. */ + if (retval == EBADF && kmode == KRB5_LOCKMODE_EXCLUSIVE) + return KRB5_KDB_CANTLOCK_DB; + else if (retval == EACCES || retval == EAGAIN || retval == EWOULDBLOCK) return KRB5_KDB_CANTLOCK_DB; - else if (retval == EAGAIN || retval == EWOULDBLOCK) - return OSA_ADB_CANTLOCK_DB; else if (retval) return retval; @@ -462,8 +452,12 @@ ctx_lock(krb5_context context, krb5_db2_context *dbc, int lockmode) /* Acquire or upgrade the policy lock. */ retval = osa_adb_get_lock(dbc->policy_db, lockmode); - if (retval) + if (retval) { (void) ctx_unlock(context, dbc); + if (retval == OSA_ADB_NOEXCL_PERM || retval == OSA_ADB_CANTLOCK_DB || + retval == OSA_ADB_NOLOCKFILE) + retval = KRB5_KDB_CANTLOCK_DB; + } return retval; } @@ -752,7 +746,7 @@ krb5_db2_get_principal(krb5_context context, krb5_const_principal searchfor, DB *db; DBT key, contents; krb5_data keydata, contdata; - int trynum, dbret; + int dbret; *entry = NULL; if (!inited(context)) @@ -760,17 +754,9 @@ krb5_db2_get_principal(krb5_context context, krb5_const_principal searchfor, dbc = context->dal_handle->db_context; - for (trynum = 0; trynum < KRB5_DB2_MAX_RETRY; trynum++) { - if ((retval = ctx_lock(context, dbc, KRB5_LOCKMODE_SHARED))) { - if (dbc->db_nb_locks) - return (retval); - sleep(1); - continue; - } - break; - } - if (trynum == KRB5_DB2_MAX_RETRY) - return KRB5_KDB_DB_INUSE; + retval = ctx_lock(context, dbc, KRB5_LOCKMODE_SHARED); + if (retval) + return retval; /* XXX deal with wildcard lookups */ retval = krb5_encode_princ_dbkey(context, &keydata, searchfor); @@ -935,10 +921,11 @@ cleanup: return retval; } +typedef krb5_error_code (*ctx_iterate_cb)(krb5_pointer, krb5_db_entry *); + static krb5_error_code ctx_iterate(krb5_context context, krb5_db2_context *dbc, - krb5_error_code (*func)(krb5_pointer, krb5_db_entry *), - krb5_pointer func_arg) + ctx_iterate_cb func, krb5_pointer func_arg) { DBT key, contents; krb5_data contdata; @@ -987,8 +974,7 @@ ctx_iterate(krb5_context context, krb5_db2_context *dbc, } krb5_error_code -krb5_db2_iterate(krb5_context context, char *match_expr, - krb5_error_code(*func) (krb5_pointer, krb5_db_entry *), +krb5_db2_iterate(krb5_context context, char *match_expr, ctx_iterate_cb func, krb5_pointer func_arg) { if (!inited(context)) diff --git a/src/plugins/kdb/db2/kdb_db2.h b/src/plugins/kdb/db2/kdb_db2.h index a2cedb8ea..df4818afd 100644 --- a/src/plugins/kdb/db2/kdb_db2.h +++ b/src/plugins/kdb/db2/kdb_db2.h @@ -49,8 +49,6 @@ typedef struct _krb5_db2_context { krb5_boolean disable_lockout; } krb5_db2_context; -#define KRB5_DB2_MAX_RETRY 5 - krb5_error_code krb5_db2_init(krb5_context); krb5_error_code krb5_db2_fini(krb5_context); krb5_error_code krb5_db2_get_age(krb5_context, char *, time_t *); |