From: Art Cancro <ajc@citadel.org>
Date: Wed, 23 Aug 2023 18:37:10 +0000 (-0900)
Subject: Remove CTDLUID definition, point to ctdluid symbol instead.
X-Git-Tag: v989~52
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=f36f0ef4b46306fa70cddb607eb48b03daa8d9d8;p=citadel.git

Remove CTDLUID definition, point to ctdluid symbol instead.

CTDLUID was probably a hard-coded preprocessor definition back in the
ancient times.  Now it is not.
---

diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c
index b16235cb3..73ca220b5 100644
--- a/citadel/server/citserver.c
+++ b/citadel/server/citserver.c
@@ -67,7 +67,7 @@ void master_startup(void) {
 		gid = pw->pw_gid;
 	}
 
-	if (create_run_directories(CTDLUID, gid) != 0) {
+	if (create_run_directories(ctdluid, gid) != 0) {
 		syslog(LOG_ERR, "citserver: failed to access and create directories");
 		exit(1);
 	}
diff --git a/citadel/server/ctdl_module.h b/citadel/server/ctdl_module.h
index 93c25674d..51470ddae 100644
--- a/citadel/server/ctdl_module.h
+++ b/citadel/server/ctdl_module.h
@@ -259,7 +259,6 @@ void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_st
 
 #define NODENAME		CtdlGetConfigStr("c_nodename")
 #define FQDN			CtdlGetConfigStr("c_fqdn")
-#define CTDLUID			ctdluid
 #define CREATAIDE		CtdlGetConfigInt("c_creataide")
 #define REGISCALL		CtdlGetConfigInt("c_regiscall")
 #define TWITDETECT		CtdlGetConfigInt("c_twitdetect")
diff --git a/citadel/server/database.c b/citadel/server/database.c
index 2e7717d03..8327ed500 100644
--- a/citadel/server/database.c
+++ b/citadel/server/database.c
@@ -59,7 +59,7 @@ void cdb_chmod_data(void) {
 		syslog(LOG_ERR, "bdb: unable to set database directory permissions [%s]: %m", ctdl_db_dir);
 		exit(CTDLEXIT_DB);
 	}
-	if (chown(ctdl_db_dir, CTDLUID, (-1)) != 0) {
+	if (chown(ctdl_db_dir, ctdluid, (-1)) != 0) {
 		syslog(LOG_ERR, "bdb: unable to set the owner for [%s]: %m", ctdl_db_dir);
 		exit(CTDLEXIT_DB);
 	}
@@ -69,7 +69,7 @@ void cdb_chmod_data(void) {
 			if (d->d_name[0] != '.') {
 				snprintf(filename, sizeof filename, "%s/%s", ctdl_db_dir, d->d_name);
 				syslog(LOG_DEBUG, "bdb: chmod(%s, 0600) returned %d", filename, chmod(filename, 0600));
-				syslog(LOG_DEBUG, "bdb: chown(%s, CTDLUID, -1) returned %d", filename, chown(filename, CTDLUID, (-1)));
+				syslog(LOG_DEBUG, "bdb: chown(%s, ctdluid, -1) returned %d", filename, chown(filename, ctdluid, (-1)));
 			}
 		}
 		closedir(dp);
diff --git a/citadel/server/modules/ctdlproto/serv_user.c b/citadel/server/modules/ctdlproto/serv_user.c
index 65e2bd47f..48fe21d9f 100644
--- a/citadel/server/modules/ctdlproto/serv_user.c
+++ b/citadel/server/modules/ctdlproto/serv_user.c
@@ -147,7 +147,7 @@ void cmd_setp(char *new_pw) {
 	if (CtdlAccessCheck(ac_logged_in)) {
 		return;
 	}
-	if ( (CC->user.uid != CTDLUID) && (CC->user.uid != (-1)) ) {
+	if ( (CC->user.uid != ctdluid) && (CC->user.uid != (-1)) ) {
 		cprintf("%d Not allowed.  Use the 'passwd' command.\n", ERROR + NOT_HERE);
 		return;
 	}
diff --git a/citadel/server/server_main.c b/citadel/server/server_main.c
index 870205346..a90ddd02d 100644
--- a/citadel/server/server_main.c
+++ b/citadel/server/server_main.c
@@ -286,7 +286,7 @@ int main(int argc, char **argv) {
 		cdb_chmod_data();	// make sure we own our data files
 		getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
 		if (pwp == NULL) {
-			syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %m Group IDs will be incorrect.", (long)CTDLUID);
+			syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %m Group IDs will be incorrect.", (long)ctdluid);
 		}
 		else {
 			initgroups(pw.pw_name, pw.pw_gid);
@@ -294,8 +294,8 @@ int main(int argc, char **argv) {
 				syslog(LOG_ERR, "main: setgid(%ld): %m", (long)pw.pw_gid);
 			}
 		}
-		syslog(LOG_INFO, "main: changing uid to %ld", (long)CTDLUID);
-		if (setuid(CTDLUID) != 0) {
+		syslog(LOG_INFO, "main: changing uid to %ld", (long)ctdluid);
+		if (setuid(ctdluid) != 0) {
 			syslog(LOG_ERR, "main: setuid() failed: %m");
 		}
 #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)