jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 15:30:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

afsconf-leak-20060915

Browse Source 
don't leak afsconf structs
This commit is contained in:
Jeffrey Altman 2006-09-16 00:17:23 +00:00
parent 914b2e27dc
commit de5f1c47e8
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/kauth/authclient.c
View File

@ -145,6 +145,7 @@ ka_GetServers(char *cell, struct afsconf_cell * cellinfo)
}
}
code = myCellLookup(conf, cell, AFSCONF_KAUTHSERVICE, cellinfo);
afsconf_Close(conf);
UNLOCK_GLOBAL_MUTEX;
return code;
}

18
src/ptserver/ptuser.c
View File

@ -71,7 +71,7 @@ pr_Initialize(IN afs_int32 secLevel, IN const char *confDir, IN char *cell)
afs_int32 code;
struct rx_connection *serverconns[MAXSERVERS];
struct rx_securityClass *sc[3];
static struct afsconf_dir *tdir = (struct afsconf_dir *)0; /* only do this once */
static struct afsconf_dir *tdir = (struct afsconf_dir *)NULL; /* only do this once */
static char tconfDir[100] = "";
static char tcell[64] = "";
struct ktc_token ttoken;
@ -109,6 +109,7 @@ pr_Initialize(IN afs_int32 secLevel, IN const 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;
@ -117,16 +118,16 @@ pr_Initialize(IN afs_int32 secLevel, IN const char *confDir, IN char *cell)
}
#endif /* defined(UKERNEL) */
if (tdir == 0 || strcmp(confDir, tconfDir) || strcmp(cell, tcell)) {
if (tdir == NULL || strcmp(confDir, tconfDir) || strcmp(cell, tcell)) {
/*
* force re-evaluation. we either don't have an afsconf_dir,
* the directory has changed or the cell has changed.
*/
if (tdir && !gottdir) {
afsconf_Close(tdir);
tdir = (struct afsconf_dir *)0;
tdir = (struct afsconf_dir *)NULL;
}
pruclient = (struct ubik_client *)0;
pruclient = (struct ubik_client *)NULL;
refresh = 1;
}
@ -153,6 +154,7 @@ pr_Initialize(IN afs_int32 secLevel, IN const 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;
@ -163,11 +165,14 @@ pr_Initialize(IN afs_int32 secLevel, IN const char *confDir, IN char *cell)
* want, don't get a new one. Unless the security level is 2 in
* 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;
}
code = rx_Init(0);
if (code) {
afsconf_Close(tdir);
fprintf(stderr, "libprot: Could not initialize rx.\n");
return code;
}
@ -216,6 +221,9 @@ pr_Initialize(IN afs_int32 secLevel, IN const char *confDir, IN char *cell)
ttoken.ticket);
}
}
afsconf_Close(tdir);
tdir = NULL;
if (scIndex == 1)
return PRBADARG;
if ((scIndex == 0) && (sc[0] == 0))

2
src/ubik/uinit.c
View File

@ -87,6 +87,7 @@ ugen_ClientInit(int noAuthFlag, char *confDir, char *cellName, afs_int32 sauth,
}
code = afsconf_ClientAuth(tdir, &sc, &scIndex); /* sets sc,scIndex */
if (code) {
afsconf_Close(tdir);
fprintf(stderr,
"%s: Could not get security object for -localAuth\n",
funcName);
@ -96,6 +97,7 @@ ugen_ClientInit(int noAuthFlag, char *confDir, char *cellName, afs_int32 sauth,
afsconf_GetCellInfo(tdir, tdir->cellName, serviceid,
&info);
if (code) {
afsconf_Close(tdir);
fprintf(stderr,
"%s: can't find cell %s's hosts in %s/%s\n",
funcName, cellName, AFSDIR_SERVER_ETC_DIRPATH,

1
src/viced/viced.c
View File

@ -1601,6 +1601,7 @@ vl_Initialize(const char *confDir)
info.hostAddr[i].sin_port, USER_SERVICE_ID, sc,
scIndex);
code = ubik_ClientInit(serverconns, &cstruct);
afsconf_Close(tdir);
if (code) {
ViceLog(0, ("vl_Initialize: ubik client init failed.\n"));
return code;