mirror of
https://git.openafs.org/openafs.git
synced 2025-02-01 05:57:43 +00:00
STABLE14-fix-afsconf-leak-20060916
this one's not a leak (cherry picked from commit 57101f38a0a868b950e32bd70b95308b1edc243d)
This commit is contained in:
parent
03e9409cc9
commit
4cb692b959
@ -109,7 +109,6 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
|
|||||||
|
|
||||||
code = afsconf_GetLocalCell(tdir, cellstr, sizeof(cellstr));
|
code = afsconf_GetLocalCell(tdir, cellstr, sizeof(cellstr));
|
||||||
if (code) {
|
if (code) {
|
||||||
afsconf_Close(tdir);
|
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"libprot: Could not get local cell. [%d]\n", code);
|
"libprot: Could not get local cell. [%d]\n", code);
|
||||||
return 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);
|
code = afsconf_GetCellInfo(tdir, cell, "afsprot", &info);
|
||||||
if (code) {
|
if (code) {
|
||||||
afsconf_Close(tdir);
|
|
||||||
fprintf(stderr, "libprot: Could not locate cell %s in %s/%s\n",
|
fprintf(stderr, "libprot: Could not locate cell %s in %s/%s\n",
|
||||||
cell, confDir, AFSDIR_CELLSERVDB_FILE);
|
cell, confDir, AFSDIR_CELLSERVDB_FILE);
|
||||||
return code;
|
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).
|
* which case we will get one (and re-read the key file).
|
||||||
*/
|
*/
|
||||||
if (pruclient && (lastLevel == secLevel) && (secLevel != 2)) {
|
if (pruclient && (lastLevel == secLevel) && (secLevel != 2)) {
|
||||||
afsconf_Close(tdir);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
code = rx_Init(0);
|
code = rx_Init(0);
|
||||||
if (code) {
|
if (code) {
|
||||||
afsconf_Close(tdir);
|
|
||||||
fprintf(stderr, "libprot: Could not initialize rx.\n");
|
fprintf(stderr, "libprot: Could not initialize rx.\n");
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
@ -221,8 +217,6 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
|
|||||||
ttoken.ticket);
|
ttoken.ticket);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
afsconf_Close(tdir);
|
|
||||||
tdir = NULL;
|
|
||||||
|
|
||||||
if (scIndex == 1)
|
if (scIndex == 1)
|
||||||
return PRBADARG;
|
return PRBADARG;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user