src/s_conf: Moved error notification to proper place

Previously it was in src/ircd.c, but accroding to jilles, this is a better place for the notification.

This changes a patch made in adef4da10c65696fb9b79ffa797615770fd53abf and amended in 65d921173c6e3aa4f30dd78561d3a6f5d5f4cf31 and f6f049070e240d0ce637e9e3ac4fba4148b9725d.

diff --git a/src/ircd.c b/src/ircd.c
index 84e62dff50a51d2cc3329d63114be02daa812f48..c739ebe91aace27c9a1b43d857da46343642b569 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -619,13 +619,6 @@ main(int argc, char *argv[])
                inotice("starting %s ...", ircd_version);
                inotice("%s", rb_lib_version());
        }
-       
-       /* Make sure config file exists -- Quora */
-       if( access( ConfigFileEntry.configfile, F_OK|R_OK ) == -1 ) {
-                 inotice("FATAL: No config file found at %s, exiting", 
-                         ConfigFileEntry.configfile);
-                 exit(-1);
-       } 
 
        /* Init the event subsystem */
        rb_lib_init(ircd_log_cb, ircd_restart_cb, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE);

diff --git a/src/s_conf.c b/src/s_conf.c
index 303ed509377a06f21ed596f09622ecbc5069c748..15e7006a1f7633db064280569098fe70fa786ef3 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -1358,6 +1358,7 @@ read_conf_files(int cold)
                if(cold)
                {
                        ilog(L_MAIN, "Failed in reading configuration file %s", filename);
+                       inotice("Failed in reading configuration file %s, aborting", filename);
                        exit(-1);
                }
                else