* setup.c: when creating an inittab entry for slapd, use "-d 0" instead

  of "-d 1" to avoid spewing messages to the console, while still remaining
  in the foreground.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 65026a7c089946358bbe5259cde8176c922b38e0..36c45a6961957b33ca953fc2c6d01f20a9a4edb0 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 625.10  2004/09/03 04:34:30  ajc
+ * setup.c: when creating an inittab entry for slapd, use "-d 0" instead
+   of "-d 1" to avoid spewing messages to the console, while still remaining
+   in the foreground.
+
  Revision 625.9  2004/09/03 04:19:17  ajc
  * setup.c: Changes to inittab-twiddling to make it a bit more reliable
  * ipc_c_tcp.c: don't send SIGHUP to children; it makes them very angry
@@ -6033,4 +6038,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 e51a036154a5314354419b796c62d822b3568bc2..9a738bb1f97c4ca07c91689d93e0da9f3dad8912 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -1241,14 +1241,17 @@ void contemplate_ldap(void) {
        /* Generate a unique entry name for slapd */
        generate_entry_name(slapd_init_entry);
 
-       /* Now write it out to /etc/inittab */
-       /* FIXME make it run as some non-root user */
+       /* Now write it out to /etc/inittab.
+        * FIXME make it run as some non-root user.
+        * The "-d 0" seems superfluous, but it's actually a way to make
+        * slapd run in the foreground without spewing messages to the console.
+        */
        fp = fopen("/etc/inittab", "a");
        if (fp == NULL) {
                display_error(strerror(errno));
        } else {
                fprintf(fp, "# Start the OpenLDAP server for Citadel...\n");
-               fprintf(fp, "%s:2345:respawn:%s -d 1 -f %s\n",
+               fprintf(fp, "%s:2345:respawn:%s -d 0 -f %s\n",
                        slapd_init_entry,
                        getenv("SLAPD_BINARY"),
                        getenv("LDAP_CONFIG")