* 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

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 984b70d952ace8f81b84bb252460066f7fac5aec..e69af02a233a5fe1a20ba995410995612bcbdf7c 100644 (file)
--- 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 f07845a14e5858991d1167b3a48310455b49cfca..bcd08a2fb9b8ae603499187d4344320255909958 100644 (file)
--- 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 */