From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 25 Sep 2012 19:59:57 +0000 (+0100)
Subject: Remove duplicate version/copyright info
X-Git-Tag: release_3_0_0_beta1~1684
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26c8b9b0e76b086207b8e67eea874af73b551048;p=thirdparty%2Ffreeradius-server.git

Remove duplicate version/copyright info

Print compilation flags at DEBUG >= 3 (this is actually useful if you're using a package version)
---

diff --git a/src/main/radiusd.c b/src/main/radiusd.c
index 94cb677fb88..e4452af6f0b 100644
--- a/src/main/radiusd.c
+++ b/src/main/radiusd.c
@@ -219,9 +219,14 @@ int main(int argc, char *argv[])
 				break;
 
 			case 'v':
+				/* Don't print timestamps */
+				debug_flag += 2;
+				fr_log_fp = stdout;
+				mainconfig.radlog_dest = RADLOG_STDOUT;
+				mainconfig.radlog_fd = STDOUT_FILENO;
+				
 				version();
-				break;
-
+				exit(0);
 			case 'X':
 				spawn_flag = FALSE;
 				dont_fork = TRUE;
@@ -250,15 +255,8 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (debug_flag) {
-		radlog(L_INFO, "%s", radiusd_version);
-		radlog(L_INFO, "Copyright (C) 1999-2012 The FreeRADIUS server project and contributors.\n");
-		radlog(L_INFO, "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n");
-		radlog(L_INFO, "PARTICULAR PURPOSE.\n");
-		radlog(L_INFO, "You may redistribute copies of FreeRADIUS under the terms of the\n");
-		radlog(L_INFO, "GNU General Public License v2.\n");
-		radlog(L_INFO, "\n");
-	}
+	if (debug_flag)
+		version();
 
 	/*  Read the configuration files, BEFORE doing anything else.  */
 	if (read_mainconfig(0) < 0) {
diff --git a/src/main/version.c b/src/main/version.c
index b91e3d42b15..67d2bf54569 100644
--- a/src/main/version.c
+++ b/src/main/version.c
@@ -30,78 +30,70 @@ RCSID("$Id$")
 /*
  *	Display the revision number for this program
  */
-void NEVER_RETURNS version(void)
+void version(void)
 {
-
-	printf("%s: %s\n", progname, radiusd_version);
-
-	printf("Copyright (C) 1999-2012 The FreeRADIUS server project and contributors.\n");
-	printf("There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n");
-	printf("PARTICULAR PURPOSE.\n");
-	printf("You may redistribute copies of FreeRADIUS under the terms of the\n");
-	printf("GNU General Public License.\n");
-	printf("For more information about these matters, see the file named COPYRIGHT.\n");
-
-	if (debug_flag) {
-		printf("\n");
-
-		printf("Functionality: ");
+	radlog(L_INFO, "%s: %s", progname, radiusd_version);
+	DEBUG3("Functionality: ");
 		
 #ifdef WITH_ACCOUNTING
-		printf("accounting, ");
+	DEBUG3(" accounting");
 #endif
-		printf("authentication, "); /* always enabled */
+	DEBUG3(" authentication"); /* always enabled */
 
 #ifdef WITH_COA
-		printf("coa, ");
+	DEBUG3(" coa");
 #endif
 #ifdef WITH_COMMAND_SOCKET
-		printf("control-socket, ");
+	DEBUG3(" control-socket");
 #endif
 #ifdef WITH_DETAIL
-		printf("detail, ");
+	DEBUG3(" detail");
 #endif
 #ifdef WITH_DHCP
-		printf("dhcp, ");
+	DEBUG3(" dhcp");
 #endif
 #ifdef WITH_DYNAMIC_CLIENTS
-		printf("dynamic clients, ");
+	DEBUG3(" dynamic clients");
 #endif
 #ifdef OSFC2
-		printf("OSFC2, ");
+	DEBUG3(" OSFC2");
 #endif
 #ifdef WITH_PROXY
-		printf("proxy, ");
+	DEBUG3(" proxy");
 #endif
 #ifdef HAVE_PCREPOSIX_H
-		printf("regex-PCRE, ");
+	DEBUG3(" regex-PCRE");
 #else
 #ifdef HAVE_REGEX_H
-		printf("regex-posix, ");
+	DEBUG3(" regex-posix");
 #endif
 #endif
 
 #ifdef WITH_SESSION_MGMT
-		printf("session-management, ");
+	DEBUG3(" session-management");
 #endif
 #ifdef WITH_STATS
-		printf("stats, ");
+	DEBUG3(" stats");
 #endif
 #ifdef WITH_TCP
-		printf("tcp, ");
+	DEBUG3(" tcp");
 #endif
 #ifdef WITH_TLS
-		printf("TLS, ");
+	DEBUG3(" TLS");
 #endif
 #ifdef WITH_UNLANG
-		printf("unlang, ");
+	DEBUG3(" unlang");
 #endif
 #ifdef WITH_VMPS
-		printf("vmps, ");
-#endif
-		printf("\n");
-	}
-
-	exit (0);
+	DEBUG3(" vmps");
+#endif
+	radlog(L_INFO, "Copyright (C) 1999-2012 The FreeRADIUS server project and contributors.");
+	radlog(L_INFO, "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A");
+	radlog(L_INFO, "PARTICULAR PURPOSE.");
+	radlog(L_INFO, "You may redistribute copies of FreeRADIUS under the terms of the");
+	radlog(L_INFO, "GNU General Public License.");
+	radlog(L_INFO, "For more information about these matters, see the file named COPYRIGHT.");
+	
+	fflush(NULL);
 }