From d538abeb1b03b4a77d18aa17e13ac8347f4df336 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 22 Jul 2004 10:42:40 +0000 Subject: [PATCH] misc-cleanup-20040721 pass the correct data type into afssw_GetClientCellServDBDir --- src/auth/cellconfig.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c index 5a0600221..39bd0e3f0 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -204,16 +204,17 @@ IsClientConfigDirectory(const char *path) static int afsconf_Check(register struct afsconf_dir *adir) { - char tbuffer[256]; + char tbuffer[256], *p; struct stat tstat; register afs_int32 code; #ifdef AFS_NT40_ENV /* NT client CellServDB has different file name than NT server or Unix */ if (IsClientConfigDirectory(adir->name)) { - if ( !afssw_GetClientCellServDBDir(tbuffer) ) { - strcompose(tbuffer, sizeof(tbuffer), adir->name, "/", + if ( !afssw_GetClientCellServDBDir(&p) ) { + strcompose(tbuffer, sizeof(tbuffer), p, "/", AFSDIR_CELLSERVDB_FILE_NTCLIENT, NULL); + free(p); } else { int len; strncpy(tbuffer, adir->name, sizeof(tbuffer)); @@ -248,7 +249,7 @@ afsconf_Check(register struct afsconf_dir *adir) static int afsconf_Touch(register struct afsconf_dir *adir) { - char tbuffer[256]; + char tbuffer[256], *p; #ifndef AFS_NT40_ENV struct timeval tvp[2]; #endif @@ -259,9 +260,10 @@ afsconf_Touch(register struct afsconf_dir *adir) /* NT client CellServDB has different file name than NT server or Unix */ if (IsClientConfigDirectory(adir->name)) { - if ( !afssw_GetClientCellServDBDir(tbuffer) ) { - strcompose(tbuffer, sizeof(tbuffer), adir->name, "/", + if ( !afssw_GetClientCellServDBDir(&p) ) { + strcompose(tbuffer, sizeof(tbuffer), p, "/", AFSDIR_CELLSERVDB_FILE_NTCLIENT, NULL); + free(p); } else { int len = strlen(tbuffer); if ( tbuffer[len-1] != '\\' && tbuffer[len-1] != '/' ) { @@ -432,9 +434,11 @@ afsconf_OpenInternal(register struct afsconf_dir *adir, char *cell, */ if (IsClientConfigDirectory(adir->name)) { /* NT client config dir */ - if ( !afssw_GetClientCellServDBDir(tbuffer) ) { - strcompose(tbuffer, sizeof(tbuffer), adir->name, "/", + char * p; + if ( !afssw_GetClientCellServDBDir(&p) ) { + strcompose(tbuffer, sizeof(tbuffer), p, "/", AFSDIR_CELLSERVDB_FILE_NTCLIENT, NULL); + free(p); } else { int len; strncpy(tbuffer, adir->name, sizeof(tbuffer)); -- 2.39.5