From: Art Cancro <ajc@uncensored.citadel.org>
Date: Tue, 20 Sep 2011 19:02:25 +0000 (-0400)
Subject: Changed the naming convention of the setup wizard filename
X-Git-Tag: v8.01~18^2~3
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2b94425ef1e12da95d8fed1e6f053d0ae9f7ccc4

Changed the naming convention of the setup wizard filename
---

diff --git a/webcit/auth.c b/webcit/auth.c
index 6c71b9aeb..76fb13dc1 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -433,16 +433,10 @@ void do_welcome(void)
 		if (!setup_wizard) {
 			int len;
 			sprintf(wizard_filename, "setupwiz.%s.%s",
-				ctdlhost, ctdlport);
-			len = strlen(wizard_filename);
-			for (i=0; i<len; ++i) {
-				if (	(wizard_filename[i]==' ')
-					|| (wizard_filename[i] == '/')
-				) {
-					wizard_filename[i] = '_';
-				}
-			}
-	
+				abs(HashLittle(ctdlhost, strlen(ctdlhost))),
+				abs(HashLittle(ctdlport, strlen(ctdlport)))
+			);
+
 			fp = fopen(wizard_filename, "r");
 			if (fp != NULL) {
 				fgets(buf, sizeof buf, fp);
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 603265eca..612ac5d08 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -39,18 +39,16 @@ extern void webcit_calc_dirs_n_files(int relh, const char *basedir, int home, ch
 extern void worker_entry(void);
 extern void drop_root(uid_t UID);
 
-char socket_dir[PATH_MAX];			/* where to talk to our citadel server */
-
+char socket_dir[PATH_MAX];	/* where to talk to our citadel server */
 char *server_cookie = NULL;	/* our Cookie connection to the client */
 int http_port = PORT_NUM;	/* Port to listen on */
-char *ctdlhost = DEFAULT_HOST;	/* our name */
-char *ctdlport = DEFAULT_PORT;	/* our Port */
-int setup_wizard = 0;		/* should we run the setup wizard? \todo */
-char wizard_filename[PATH_MAX];	/* where's the setup wizard? */
+char *ctdlhost = DEFAULT_HOST;	/* Host name or IP address of Citadel server */
+char *ctdlport = DEFAULT_PORT;	/* Port number of Citadel server */
+int setup_wizard = 0;		/* should we run the setup wizard? */
+char wizard_filename[PATH_MAX];	/* location of file containing the last webcit version against which we ran setup wizard */
 int running_as_daemon = 0;	/* should we deamonize on startup? */
 
 
-
 /* #define DBG_PRINNT_HOOKS_AT_START */
 #ifdef DBG_PRINNT_HOOKS_AT_START
 extern HashList *HandlerHash;
@@ -436,7 +434,7 @@ int main(int argc, char **argv)
 
 	/* Become a worker thread.  More worker threads will be spawned as they are needed. */
 	worker_entry();
-	ShutDownLibCitadel ();
+	ShutDownLibCitadel();
 	return 0;
 }