From 7edb37dadb40010609a1da4edea5bf97fabf29a1 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Tue, 2 Sep 2003 18:46:13 +0000
Subject: [PATCH] Undo most of last commit... it broke .ini parsing. :-(
---
src/sbbs3/sbbscon.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c
index 0d1bec24dc..3f97053c9c 100644
--- a/src/sbbs3/sbbscon.c
+++ b/src/sbbs3/sbbscon.c
@@ -1058,6 +1058,14 @@ int main(int argc, char** argv)
prompt = "[Threads: %d Sockets: %d Clients: %d Served: %lu] (?=Help): ";
+ /* We call this function to set defaults, even if there's no .ini file */
+ sbbs_read_ini(fp,
+ &run_bbs, &bbs_startup,
+ &run_ftp, &ftp_startup,
+ &run_web, &web_startup,
+ &run_mail, &mail_startup,
+ &run_services, &services_startup);
+
/* read/default any sbbscon-specific .ini keys here */
#if defined(__unix__)
SAFECOPY(new_uid_name,iniGetString(fp,"UNIX","User","",value));
@@ -1405,14 +1413,6 @@ int main(int argc, char** argv)
pidfile=fopen(SBBS_PID_FILE,"w");
}
- /* We call this function to set defaults, even if there's no .ini file */
- sbbs_read_ini(fp,
- &run_bbs, &bbs_startup,
- &run_ftp, &ftp_startup,
- &run_web, &web_startup,
- &run_mail, &mail_startup,
- &run_services, &services_startup);
-
old_uid = getuid();
if((pw_entry=getpwnam(new_uid_name))!=0)
{
--
GitLab