X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=75c6c713752a4139f5aa8f8c5c4eb5ba6fbe98d5;hb=ca0714f168ab7cb7af8177e10941aa5c1fa3b09f;hp=b7b1ac0c87ebe5724f915477e8979dfa1d882b30;hpb=15036e4105019af481eab5a053d54df4033d8d1d;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index b7b1ac0c8..75c6c7137 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -101,8 +101,8 @@ int main(int argc, char **argv)
 		}
 
 		else if (!strncmp(argv[a], "-h", 2)) {
-			safestrncpy(bbs_home_directory, &argv[a][2],
-				    sizeof bbs_home_directory);
+			safestrncpy(ctdl_home_directory, &argv[a][2],
+				    sizeof ctdl_home_directory);
 			home_specified = 1;
 		}
 
@@ -201,17 +201,17 @@ int main(int argc, char **argv)
 	 * Load any server-side extensions available here.
 	 */
 	lprintf(CTDL_INFO, "Initializing server extensions\n");
-	size = strlen(bbs_home_directory) + 9;
+	size = strlen(ctdl_home_directory) + 9;
 	initialize_server_extensions();
 
 	/*
-	 * Now that we've bound the sockets, change to the BBS user id and its
+	 * Now that we've bound the sockets, change to the Citadel user id and its
 	 * corresponding group ids
 	 */
 	if (drop_root_perms) {
-		if ((pw = getpwuid(BBSUID)) == NULL)
+		if ((pw = getpwuid(CTDLUID)) == NULL)
 			lprintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
-				   "Group IDs will be incorrect.\n", (long)BBSUID,
+				   "Group IDs will be incorrect.\n", (long)CTDLUID,
 				strerror(errno));
 		else {
 			initgroups(pw->pw_name, pw->pw_gid);
@@ -219,8 +219,8 @@ int main(int argc, char **argv)
 				lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw->pw_gid,
 					strerror(errno));
 		}
-		lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)BBSUID);
-		if (setuid(BBSUID) != 0) {
+		lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+		if (setuid(CTDLUID) != 0) {
 			lprintf(CTDL_CRIT, "setuid() failed: %s\n", strerror(errno));
 		}
 #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)