From 98b4025af9bbbb40cf74552016972247605e0e1e Mon Sep 17 00:00:00 2001 From: Steven Van Acker Date: Thu, 15 Nov 2012 17:54:41 +0100 Subject: unhook --uid from --system in configure script Specifying --uid allows the ircd to run as a specific user, while --system fixes the install directories to be spread all over the system. Specifying --uid shouldn't imply --system. This fix allows a uid to be set while not interfering with --prefix --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index dc7d11391..d18b02418 100755 --- a/configure +++ b/configure @@ -152,11 +152,11 @@ $config{BASE_DIR} = $config{ME}."/run"; if (defined $opt_base_dir) { $config{BASE_DIR} = $opt_base_dir; -} elsif (defined $opt_system || defined $opt_uid) { +} elsif (defined $opt_system) { $config{BASE_DIR} = '/var/lib/inspircd'; } -if (defined $opt_system || defined $opt_uid) { +if (defined $opt_system) { $config{UID} = $opt_uid || 'ircd'; $config{CONFIG_DIR} = '/etc/inspircd'; $config{MODULE_DIR} = '/usr/lib/inspircd'; @@ -165,7 +165,7 @@ if (defined $opt_system || defined $opt_uid) { $config{DATA_DIR} = '/var/inspircd'; $config{LOG_DIR} = '/var/log/inspircd'; } else { - $config{UID} = $<; + $config{UID} = $opt_uid || $<; $config{CONFIG_DIR} = resolve_directory($config{BASE_DIR}."/conf"); # Configuration Directory $config{MODULE_DIR} = resolve_directory($config{BASE_DIR}."/modules"); # Modules Directory $config{BINARY_DIR} = resolve_directory($config{BASE_DIR}."/bin"); # Binary Directory -- cgit v1.2.3