From: Derrick Brashear <shadow@dementia.org>
Date: Sat, 16 Sep 2006 20:40:52 +0000 (+0000)
Subject: STABLE14-fix-afsconf-leak-20060916
X-Git-Tag: openafs-stable-1_4_2fc4~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4cb692b959e58f50c6eaf796dd914c778033cf63;p=packages%2Fo%2Fopenafs.git

STABLE14-fix-afsconf-leak-20060916


this one's not a leak


(cherry picked from commit 57101f38a0a868b950e32bd70b95308b1edc243d)
---

diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index 3c3397f45..b18a83594 100644
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -109,7 +109,6 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
 
         code = afsconf_GetLocalCell(tdir, cellstr, sizeof(cellstr));
         if (code) {
-	    afsconf_Close(tdir);
             fprintf(stderr,
                      "libprot: Could not get local cell. [%d]\n", code);
             return code;
@@ -154,7 +153,6 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
 
 	code = afsconf_GetCellInfo(tdir, cell, "afsprot", &info);
 	if (code) {
-	    afsconf_Close(tdir);
 	    fprintf(stderr, "libprot: Could not locate cell %s in %s/%s\n",
 		    cell, confDir, AFSDIR_CELLSERVDB_FILE);
 	    return code;
@@ -166,13 +164,11 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
      * which case we will get one (and re-read the key file).
      */
     if (pruclient && (lastLevel == secLevel) && (secLevel != 2)) {
-	afsconf_Close(tdir);
 	return 0;
     }
 
     code = rx_Init(0);
     if (code) {
-	afsconf_Close(tdir);
 	fprintf(stderr, "libprot:  Could not initialize rx.\n");
 	return code;
     }
@@ -221,8 +217,6 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
 					      ttoken.ticket);
 	}
     }
-    afsconf_Close(tdir);
-    tdir = NULL;
 
     if (scIndex == 1)
 	return PRBADARG;