STABLE14-pruclient-killer-fix-20060824

FIXES 37251

yeah, i should commit the fix this time. not my day

(cherry picked from commit 60f1ed2d6d68a2ce8de825147a99c0638762ed19)

diff --git a/src/viced/host.c b/src/viced/host.c
index 0467361df88aa743bbe18236168b221fe25038a3..fb92ff3aa98712f5e819645b0653c4e16fd7096f 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -282,6 +282,7 @@ hpr_Initialize(struct ubik_client **uclient)
     if (code) {
        fprintf(stderr,
                "libprot: Could not get local cell. [%d]\n", code);
+       afsconf_Close(tdir);
        return code;
     }
     
@@ -289,14 +290,14 @@ hpr_Initialize(struct ubik_client **uclient)
     if (code) {
        fprintf(stderr, "libprot: Could not locate cell %s in %s/%s\n",
                cellstr, confDir, AFSDIR_CELLSERVDB_FILE);
+       afsconf_Close(tdir);
        return code;
     }
     
-    afsconf_Close(tdir);
-    
     code = rx_Init(0);
     if (code) {
         fprintf(stderr, "libprot:  Could not initialize rx.\n");
+       afsconf_Close(tdir);
         return code;
     }
     
@@ -360,7 +361,7 @@ hpr_Initialize(struct ubik_client **uclient)
     if (code) {
         com_err("fileserver", code, "ubik client init failed.");
     }
-
+    afsconf_Close(tdir);
     code = rxs_Release(sc[scIndex]);
     return code;
 }