diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-07-09 17:44:13 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-07-09 17:44:13 +0000 |
| commit | a87cafedc022a201cda348cb080d244df69d4df6 (patch) | |
| tree | 3b5e24d8c9779f51dfa986c7a2f5ae3a288bde76 /src/lib/kdb | |
| parent | 73f65d23536c6c62d5f9bac1493aa4acb615b299 (diff) | |
| download | krb5-a87cafedc022a201cda348cb080d244df69d4df6.tar.gz krb5-a87cafedc022a201cda348cb080d244df69d4df6.tar.xz krb5-a87cafedc022a201cda348cb080d244df69d4df6.zip | |
* kdb_db2.c (krb5_db2_db_get_principal): Rename local variable "try"
to "trynum" because some systems (*cough*Tru64*cough*) turn on some
exception handling support when thread support is enabled.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16572 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb')
| -rw-r--r-- | src/lib/kdb/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/kdb/kdb_db2.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 984b70d95..e69af02a2 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,10 @@ +2004-07-09 Ken Raeburn <raeburn@mit.edu> + + * kdb_db2.c (krb5_db2_db_get_principal): Rename local variable + "try" to "trynum" because some systems (*cough*Tru64*cough*) turn + on some exception handling support when thread support is + enabled. + 2004-06-04 Ken Raeburn <raeburn@mit.edu> * Makefile.in (LIBBASE): Renamed from LIB. diff --git a/src/lib/kdb/kdb_db2.c b/src/lib/kdb/kdb_db2.c index f07845a14..bcd08a2fb 100644 --- a/src/lib/kdb/kdb_db2.c +++ b/src/lib/kdb/kdb_db2.c @@ -894,7 +894,7 @@ krb5_db2_db_get_principal(context, searchfor, entries, nentries, more) DB *db; DBT key, contents; krb5_data keydata, contdata; - int try, dbret; + int trynum, dbret; *more = FALSE; *nentries = 0; @@ -903,7 +903,7 @@ krb5_db2_db_get_principal(context, searchfor, entries, nentries, more) return KRB5_KDB_DBNOTINITED; db_ctx = (krb5_db2_context *) context->db_context; - for (try = 0; try < KRB5_DB2_MAX_RETRY; try++) { + for (trynum = 0; trynum < KRB5_DB2_MAX_RETRY; trynum++) { if ((retval = krb5_db2_db_lock(context, KRB5_LOCKMODE_SHARED))) { if (db_ctx->db_nb_locks) return(retval); @@ -912,7 +912,7 @@ krb5_db2_db_get_principal(context, searchfor, entries, nentries, more) } break; } - if (try == KRB5_DB2_MAX_RETRY) + if (trynum == KRB5_DB2_MAX_RETRY) return KRB5_KDB_DB_INUSE; /* XXX deal with wildcard lookups */ |