From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 30 Dec 2006 16:56:39 +0000 (+0000)
Subject: STABLE14-afsdb-resolver-reinit-20061230
X-Git-Tag: openafs-stable-1_4_3rc1~36
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=62542d9c764f44a288379427a4b5c3dce7a1bfea;p=packages%2Fo%2Fopenafs.git

STABLE14-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 4520757ec..ad7134eb0 100644
--- 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;
 	}