* setup.c: fixed an incorrect variable name that was causing inittab

  twiddling to malfunction.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index b8878002c968c1493a6b961764f93f772c5df7e9..005706e687e0cef863c9c06f3d8940a6f9bb7f6c 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 626.17  2004/11/02 22:59:20  ajc
+ * setup.c: fixed an incorrect variable name that was causing inittab
+   twiddling to malfunction.
+
  Revision 626.16  2004/11/02 02:47:10  ajc
  * Easy Install: put the log directly in /tmp instead of in the build
    directory so it doesn't get deleted on a failed install.
@@ -6182,4 +6186,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/setup.c b/citadel/setup.c
index 3681061d9609425465cfc3f2557b240277a3cf09..397a84d758f45219452f6c52554a362f1b260829 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -153,12 +153,11 @@ void set_init_entry(char *which_entry, char *new_state) {
 /*
  * Locate the name of an inittab entry for a specific program
  */
-void locate_init_entry(char *init_entry, char *program) {
+void locate_init_entry(char *init_entry, char *looking_for) {
 
        FILE *infp;
        char buf[SIZ];
        int have_entry = 0;
-       char looking_for[SIZ];
        char entry[SIZ];
        char prog[SIZ];
 
@@ -193,7 +192,7 @@ void locate_init_entry(char *init_entry, char *program) {
 void shutdown_citserver(void) {
        char looking_for[SIZ];
 
-       snprintf(looking_for, sizeof looking_for, "%s/citserver", BBSDIR);
+       snprintf(looking_for, sizeof looking_for, "%s/citserver", setup_directory);
        locate_init_entry(citserver_init_entry, looking_for);
        if (strlen(citserver_init_entry) > 0) {
                set_init_entry(citserver_init_entry, "off");
@@ -515,7 +514,7 @@ void check_inittab_entry(void)
        char entryname[5];
 
        /* Determine the fully qualified path name of citserver */
-       snprintf(looking_for, sizeof looking_for, "%s/citserver", BBSDIR);
+       snprintf(looking_for, sizeof looking_for, "%s/citserver", setup_directory);
        locate_init_entry(citserver_init_entry, looking_for);
 
        /* If there's already an entry, then we have nothing left to do. */