m_spanningtree Fix rare desync when a KILL crosses a message that has the killed...

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index dc7d113916196938c0f5d6c380d57ac292d1b9a6..d18b02418864c5c16ab90b91fd9b0a2d17486b55 100755 (executable)
--- 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