Skip to content

Commit

Permalink
* kdb_db2.c (krb5_db2_db_get_principal): Rename local variable "try"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
raeburn committed Jul 9, 2004
1 parent 779f86e commit 4f48f04
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions 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.
Expand Down
6 changes: 3 additions & 3 deletions src/lib/kdb/kdb_db2.c
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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 */
Expand Down

0 comments on commit 4f48f04

Please sign in to comment.