From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 24 Feb 2025 15:24:51 +0000 (+0000)
Subject: Fix up Debian patch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c301ff537f29ed8775e1cd771c5997a95dca754;p=thirdparty%2Ffreeradius-server.git

Fix up Debian patch

Until the main config gets re-named
---

diff --git a/debian/patches/radiusd-to-freeradius.diff b/debian/patches/radiusd-to-freeradius.diff
index 4b0a28b3bb..155a274436 100644
--- a/debian/patches/radiusd-to-freeradius.diff
+++ b/debian/patches/radiusd-to-freeradius.diff
@@ -78,22 +78,17 @@ Index: freeradius-server/src/bin/radiusd.c
 ===================================================================
 --- freeradius-server.orig/src/bin/radiusd.c
 +++ freeradius-server/src/bin/radiusd.c
-@@ -230,14 +230,11 @@ int main(int argc, char *argv[])
- 	}
+@@ -319,7 +319,12 @@ int main(int argc, char *argv[])
+                EXIT_WITH_FAILURE;
+        }
  
- 	/*
--	 *	Set some default values
++ 	/*
 +	 *
 +	 *	Debian changes the binary name to "freeradius", but
 +	 *	leaves the configuration file as "radiusd.conf".
- 	 */
--	program = strrchr(argv[0], FR_DIR_SEP);
--	if (!program) {
--		program = argv[0];
--	} else {
--		program++;
--	}
-+	program = "radiusd";
- 	main_config_name_set_default(config, program, false);
++ 	 */
+-       main_config_name_set_default(config, program, false);
++       main_config_name_set_default(config, "radiusd", false);
  
- 	config->daemonize = true;
+        config->daemonize = true;
+        config->spawn_workers = true;