From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 3 Nov 2015 14:38:16 +0000 (-0500)
Subject: Hard-code the default name to radiusd.
X-Git-Tag: release_3_0_11~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f91bdb96b732e44327113f36178cf60501d035b;p=thirdparty%2Ffreeradius-server.git

Hard-code the default name to radiusd.

Because debian renames the binaries and configuration directory,
but *not* the configuration file
---

diff --git a/debian/patches/radiusd-to-freeradius.diff b/debian/patches/radiusd-to-freeradius.diff
index 9cac4c723c5..b3625f892e7 100644
--- a/debian/patches/radiusd-to-freeradius.diff
+++ b/debian/patches/radiusd-to-freeradius.diff
@@ -63,3 +63,30 @@
  
  	#
  	#  Access mode.
+diff --git a/src/main/radiusd.c b/src/main/radiusd.c
+index 1ae66ec..ee1a711 100644
+--- a/src/main/radiusd.c
++++ b/src/main/radiusd.c
+@@ -93,7 +93,6 @@ int main(int argc, char *argv[])
+	bool display_version = false;
+	int flag = 0;
+	int from_child[2] = {-1, -1};
+-	char *p;
+	fr_state_t *state = NULL;
+
+	/*
+@@ -128,13 +127,7 @@ int main(int argc, char *argv[])
+	main_config.myip.af = AF_UNSPEC;
+	main_config.port = 0;
+	main_config.daemonize = true;
+-
+-	p = strrchr(argv[0], FR_DIR_SEP);
+-	if (!p) {
+-		main_config.name = argv[0];
+-	} else {
+-		main_config.name = p + 1;
+-	}
++	main_config.name = "radiusd";
+
+	/*
+	 *	Don't put output anywhere until we get told a little