* setup.c: fix bug that kept creating new inittab entries for slapd

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 65daf08e779e8e009e131b9526078f5b1dd7e2b9..3b8ed221c95836867a2f464cced88f7f7aec1c48 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 627.4  2004/11/11 04:38:36  ajc
+ * setup.c: fix bug that kept creating new inittab entries for slapd
+
  Revision 627.3  2004/11/10 21:33:47  ajc
  * Go to Berkeley DB 4.3.21 in Easy Install
 
@@ -6201,3 +6204,4 @@ 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 397a84d758f45219452f6c52554a362f1b260829..f8c3e2d0b8b660dbc65d258dd4a9f7bc4f9feab0 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -1318,8 +1318,10 @@ void contemplate_ldap(void) {
                set_init_entry(slapd_init_entry, "off");
        }
 
-       /* Generate a unique entry name for slapd */
-       generate_entry_name(slapd_init_entry);
+       /* Otherwise, generate a unique entry name for slapd */
+       else {
+               generate_entry_name(slapd_init_entry);
+       }
 
        /* Now write it out to /etc/inittab.
         * FIXME make it run as some non-root user.