Author: Isomer <isomer@coders.net>

Log message:

Fixed minor bugs in command line handling that made testing a pain.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@260 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index e7cf371ec51846cd9a13eadb53f8b09c3d8c0726..386e9bb7714833fb904ae6df5ae11eb7083cca33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2000-05-29  Perry Lorier       <Isomer@coders.net>
+2000-06-30  Perry Lorier       <Isomer@coders.net>
+       * ircd/ircd.c: Fix command line parameter bugs.
+
+2000-06-30  Perry Lorier       <Isomer@coders.net>
        * ircd/m_kill.c: Fixed bug with LOCAL_KILL_ONLY
        * ircd/m_nick.c: Tidied things up.
 
@@ -1242,7 +1245,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.149 2000-06-29 23:21:15 isomer Exp $
+# $Id: ChangeLog,v 1.150 2000-06-29 23:44:45 isomer Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/ircd.c b/ircd/ircd.c
index e16eebf41fc27b8db22ccba24bbbe89f6f9f4d0f..31ecd8a043b3daaf7ccd6b4dc7ae7c7744143fb1 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -550,12 +550,12 @@ static char set_chroot_environment(void) {
   if (geteuid())
     seteuid(0);
 
-  if (chdir(DPATH)) {
-    fprintf(stderr, "Fail: Cannot chdir(%s): %s\n", DPATH, strerror(errno));
+  if (chdir(dpath)) {
+    fprintf(stderr, "Fail: Cannot chdir(%s): %s\n", dpath, strerror(errno));
     return 0;
   }
-  if (chroot(DPATH)) {
-    fprintf(stderr, "Fail: Cannot chroot(%s): %s\n", DPATH, strerror(errno));
+  if (chroot(dpath)) {
+    fprintf(stderr, "Fail: Cannot chroot(%s): %s\n", dpath, strerror(errno));
     return 0;
   }
   dpath = "/";
@@ -629,7 +629,7 @@ int main(int argc, char **argv) {
 
   /* Check paths for accessibility */
   if (!check_file_access(SPATH, 'S', X_OK) ||
-      !check_file_access(CPATH, 'C', R_OK) ||
+      !check_file_access(configfile, 'C', R_OK) ||
       !check_file_access(MPATH, 'M', R_OK) ||
       !check_file_access(RPATH, 'R', R_OK))
     exit(4);