setup.c: default node name is now obtained from uname()

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 7d4d276b12abd31d59e368ca72365b07a477c3e6..434e652d71ecbac78d85aea43a1a3fa8987a9798 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,6 @@
+Fri Oct 23 19:34:38 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * setup.c: default node name is now obtained from uname()
+
 Wed Oct 21 22:24:48 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Mail rooms now hide their owner-prefix from the client.
        * proxy.c: added configurability and primitive message expiry

diff --git a/citadel/setup.c b/citadel/setup.c
index b925402c16d96550677f860f4126ea8e9619852a..cb590f65cafc893e2bf3dcdf18df220bf946b4bd 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -12,6 +12,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
 #include <netdb.h>
 #include <errno.h>
 #include <limits.h>
@@ -859,6 +860,7 @@ int main(int argc, char *argv[]) {
        FILE *fp;
        int old_setup_level = 0;
        int info_only = 0;
+       struct utsname my_utsname;
 
        /* set an invalid setup type */
        setup_type = (-1);
@@ -896,6 +898,7 @@ int main(int argc, char *argv[]) {
                cleanup(0);
                }
 
+       /* Get started in a valid setup directory. */
        strcpy(setup_directory, BBSDIR);
        set_str_val(0, setup_directory);
        if (chdir(setup_directory) != 0) {
@@ -904,7 +907,10 @@ int main(int argc, char *argv[]) {
                cleanup(errno);
                }
 
+       /* Determine our host name, in case we need to use it as a default */
+       uname(&my_utsname);
 
+       /* Now begin. */
        switch(setup_type) {
                
                case UI_TEXT:
@@ -948,9 +954,9 @@ int main(int argc, char *argv[]) {
 
        /* set some sample/default values in place of blanks... */
        if (strlen(config.c_nodename)==0)
-               strcpy(config.c_nodename,"mysystem");
+               strcpy(config.c_nodename, my_utsname.nodename);
        if (strlen(config.c_fqdn)==0)
-               sprintf(config.c_fqdn,"%s.UUCP",config.c_nodename);
+               sprintf(config.c_fqdn, "%s.citadelia.org", my_utsname.nodename);
        if (strlen(config.c_humannode)==0)
                strcpy(config.c_humannode,"My System");
        if (strlen(config.c_phonenum)==0)
@@ -1045,10 +1051,8 @@ NEW_INST:
        sprintf(aaa,"mkdir %s 2>/dev/null",config.c_bucket_dir);
        system(aaa);
 
-
-       system("rm -fr ./chatpipes 2>/dev/null");       /* Don't need these */
-       system("rm -fr ./expressmsgs 2>/dev/null");
-       unlink("sessions");
+       /* Delete a bunch of old files from Citadel v4; don't need anymore */
+       system("rm -fr ./chatpipes ./expressmsgs sessions 2>/dev/null");
 
        check_services_entry();         /* Check /etc/services */
        check_inittab_entry();          /* Check /etc/inittab */