* setup.c: clarify some of the messages

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index a687a2d5ae538be53c2439dc380308f86a514557..7f91a024b9224d6ee6b1145a45225bc1c3b9ac36 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 640.11  2005/02/17 03:52:16  ajc
+ * setup.c: clarify some of the messages
+
  Revision 640.10  2005/02/16 19:03:38  ajc
  * master_cleanup() now passes along an exit code from its caller to the OS.
 
@@ -6411,4 +6414,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 db36bc3f87069934872a5c54b4a550df8504f1bc..a2828f688f4d934af17db38215b397345915efce 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <pwd.h>
+#include <time.h>
 
 #include "citadel.h"
 #include "axdefs.h"
@@ -69,7 +70,7 @@ char *setup_text[] = {
 
 "Enter the name of the system administrator (which is probably\n"
 "you).  When an account is created with this name, it will\n"
-"automatically be assigned the highest access level.\n",
+"automatically be given administrator-level access.\n",
 
 "Citadel needs to run under its own user ID.  This would\n"
 "typically be called \"citadel\", but if you are running Citadel\n"
@@ -623,9 +624,13 @@ void disable_other_mta(char *mta) {
        /* Offer to replace other MTA with the vastly superior Citadel :)  */
        snprintf(buf, sizeof buf,
                "You appear to have the \"%s\" email program\n"
-               "running on your system.  Would you like to disable it,\n"
-               "allowing Citadel to handle your Internet mail instead?\n",
-               mta
+               "running on your system.  If you want Citadel mail\n"
+               "connected with %s, you will have to manually integrate\n"
+               "them.  It is preferable to disable %s, and use Citadel's\n"
+               "SMTP, POP3, and IMAP services.\n\n"
+               "May we disable %s so that Citadel has access to ports\n"
+               "25, 110, and 143?\n",
+               mta, mta, mta, mta
        );
        if (yesno(buf) == 0)
                return;
@@ -653,7 +658,7 @@ int test_server(void) {
         * to the server and try to get it back.  The cookie does not
         * have to be secret ... just unique.
         */
-       sprintf(cookie, "%ld.%d", time(NULL), getpid());
+       sprintf(cookie, "--test--%d--", getpid());
 
        sprintf(cmd, "%s/sendcommand -h%s ECHO %s 2>&1",
                setup_directory,
@@ -1213,7 +1218,10 @@ NEW_INST:
                }
                if (test_server() == 0) {
                        important_message("Setup finished",
-                               "Setup is finished.  You may now log in.");
+                               "Setup of the Citadel server is complete.\n"
+                               "If you will be using WebCit, please run its\n"
+                               "setup program now; otherwise, run './citadel'\n"
+                               "to log in.\n");
                }
                else {
                        important_message("Setup finished",
@@ -1299,7 +1307,7 @@ void contemplate_ldap(void) {
         * this password generation scheme is too weak, please submit a patch
         * instead of just whining about it, ok?
         */
-       sprintf(config.c_ldap_bind_pw, "%d%ld", getpid(), time(NULL));
+       sprintf(config.c_ldap_bind_pw, "%d%ld", getpid(), (long)time(NULL));
 
        write_config_to_disk();