From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 23 Apr 2009 06:59:02 +0000 (+0200)
Subject: Moved HUP code to mainconfig
X-Git-Tag: release_2_1_7~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba4aada75a5c982cc0f4e31bfe53be23c83bce9e;p=thirdparty%2Ffreeradius-server.git

Moved HUP code to mainconfig
---

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index efe36f711d2..e18f52f103e 100644
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -608,6 +608,7 @@ extern struct main_config_t mainconfig;
 
 int read_mainconfig(int reload);
 int free_mainconfig(void);
+void hup_mainconfig(void);
 void fr_suid_down(void);
 void fr_suid_up(void);
 void fr_suid_down_permanent(void);
diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index 4b20876d9fc..91bd158a524 100644
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -932,3 +932,8 @@ int free_mainconfig(void)
 
 	return 0;
 }
+
+void hup_mainconfig(void)
+{
+	module_hup(cf_section_sub_find(mainconfig.config, "modules"));
+}
diff --git a/src/main/radiusd.c b/src/main/radiusd.c
index ffb7c6aa1a4..46597f5c4da 100644
--- a/src/main/radiusd.c
+++ b/src/main/radiusd.c
@@ -169,6 +169,9 @@ int main(int argc, char *argv[])
 				break;
 
 			case 'l':
+				if (strcmp(optarg, "stdout") == 0) {
+					goto do_stdout;
+				}
 				mainconfig.log_file = strdup(optarg);
 				mainconfig.radlog_dest = RADLOG_FILES;
 				break;		  
@@ -219,6 +222,7 @@ int main(int argc, char *argv[])
 				mainconfig.log_auth = TRUE;
 				mainconfig.log_auth_badpass = TRUE;
 				mainconfig.log_auth_goodpass = TRUE;
+		do_stdout:
 				mainconfig.radlog_dest = RADLOG_STDOUT;
 				mainconfig.radlog_fd = STDOUT_FILENO;
 				fr_log_fp = stdout;
@@ -394,7 +398,7 @@ int main(int argc, char *argv[])
 	while ((rcode = radius_event_process()) == 0x80) {
 		radius_stats_init(1);
 		radlog(L_INFO, "Received HUP.");
-		module_hup(cf_section_sub_find(mainconfig.config, "modules"));
+		hup_mainconfig();
 	}
 	
 	radlog(L_INFO, "Exiting normally.");