DEVEL15-afsdb-resolver-reinit-20061230

FIXES 50576

replace 'try' with 'try_init' and declare 'try_init'.
'try' is a reserved word on some compilers.  not sure how this code
was compiling on MacOS X and Windows as 'try' was not declared.

(cherry picked from commit 47b4f514cadb815fff7be99726911599cacfb287)

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index 44491d374b59c097357b6a3b5613280270daaa74..1726819cefd3faa6e7db83222b57239e6eeabf01 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -860,6 +860,7 @@ afsconf_GetAfsdbInfo(char *acellName, char *aservice,
     char host[256];
     int server_num = 0;
     int minttl = 0;
+    int try_init = 0;
 
     /* The resolver isn't always MT-safe.. Perhaps this ought to be
      * replaced with a more fine-grained lock just for the resolver
@@ -886,8 +887,8 @@ afsconf_GetAfsdbInfo(char *acellName, char *aservice,
        UNLOCK_GLOBAL_MUTEX;
     }
     if (len < 0) {
-       if (try < 1) {
-           try++;
+       if (try_init < 1) {
+           try_init++;
            res_init();
            goto retryafsdb;
        }