X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fsetup.c;h=8f9cd5867ae9949064fb48201479dbc57fca1e19;hb=1f6877630b975698550c84e1f7f47a761316097b;hp=ae7b28ecd3a728cf30f359667f3f59bbf5d55387;hpb=e58db336b65ebc489bd6f864cfaa981ae8598a9b;p=citadel.git

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index ae7b28ecd..8f9cd5867 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -1278,17 +1278,17 @@ void GetDefaultValChar(char *WhereTo, const char *VarName, char DefVal)
 		*WhereTo = atoi(ch);
 	}
 }
-#define GetDefaultVALSTR(CFGNAME, DEFL) GetDefaultValStr((char**)&config.CFGNAME, sizeof(config.CFGNAME), "CITADEL_"#CFGNAME, DEFL)
-void GetDefaultValStr(char **WhereTo, size_t nMax, const char *VarName, const char *DefVal)
+#define GetDefaultVALSTR(CFGNAME, DEFL) GetDefaultValStr(&config.CFGNAME[0], sizeof(config.CFGNAME), "CITADEL_"#CFGNAME, DEFL)
+void GetDefaultValStr(char *WhereTo, size_t nMax, const char *VarName, const char *DefVal)
 {
 	const char *ch;
-	if (**WhereTo == '\0') 
-		safestrncpy(*WhereTo, DefVal, nMax);
+	if (*WhereTo == '\0') 
+		safestrncpy(WhereTo, DefVal, nMax);
 
 	if ((setup_type == UI_SILENT) &&
 	    (ch = getenv(VarName), ch != NULL))
 	{
-		safestrncpy(*WhereTo, ch, nMax);
+		safestrncpy(WhereTo, ch, nMax);
 	}
 }