* Removed the last vestiges of the now-obsolete global networking password

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 9657a4256d6180f77e50963ec0b3324750661809..ef0827da2832e8b3379f6d0ea71e64b513025223 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 608.21  2003/08/13 18:08:24  ajc
+ * Removed the last vestiges of the now-obsolete global networking password
+
  Revision 608.20  2003/08/13 14:36:04  ajc
  * "make install" now installs the contents of docs/ as well as README.txt
 
@@ -4955,4 +4958,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/citadel.h b/citadel/citadel.h
index d746caa9174967de4cb2ba9cce7d3fe1f67062e6..85151bd4ac80658e61767ece999f95ce2cd0134c 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -82,9 +82,10 @@ struct ExpirePolicy {
  * Global system configuration.
  * 
  * Developers: please do NOT remove the fields labelled "not in use".  We
- * can't simply remove them from the struct, because that would render the
- * configs on existing systems corrupt.  However, if you need the same number
- * of bytes for a *new* field, feel free to use them.
+ * can't simply remove them from the struct, because this gets written to
+ * disk, and if you change it then you'll break all existing systems.
+ * However, if you'd like to reclaim some of that space for another use, feel
+ * free to do so, as long as the sizes are kept identical.
  */
 struct config {
        char c_nodename[16];            /* Unqualified "short" nodename     */
@@ -106,7 +107,7 @@ struct config {
        char c_niu_2[15];               /* (not in use)                     */
        int c_setup_level;              /* what rev level we've setup to    */
        int c_maxsessions;              /* maximum concurrent sessions      */
-       char c_net_password[20];        /* system net password (obsolete)   */
+       char c_niu_3[20];               /* (not in use)                     */
        int c_port_number;              /* Cit listener port (usually 504)  */
        int c_ipgm_secret;              /* Internal program authentication  */
        struct ExpirePolicy c_ep;       /* System default msg expire policy */

diff --git a/citadel/control.c b/citadel/control.c
index 52dadbf76d3be43ad6edef77bfe90976ad24ee0d..f582c4aa64ca25c71d0aff3c1a173268253c7fad 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -180,7 +180,7 @@ void cmd_conf(char *argbuf)
                cprintf("%s\n", config.c_bbs_city);
                cprintf("%s\n", config.c_sysadm);
                cprintf("%d\n", config.c_maxsessions);
-               cprintf("%s\n", config.c_net_password);
+               cprintf("xxx\n"); /* placeholder -- field no longer in use */
                cprintf("%d\n", config.c_userpurge);
                cprintf("%d\n", config.c_roompurge);
                cprintf("%s\n", config.c_logpages);
@@ -271,8 +271,7 @@ void cmd_conf(char *argbuf)
                                        config.c_maxsessions = 1;
                                break;
                        case 15:
-                               safestrncpy(config.c_net_password, buf,
-                                           sizeof config.c_net_password);
+                               /* placeholder -- field no longer in use */
                                break;
                        case 16:
                                config.c_userpurge = atoi(buf);

diff --git a/citadel/routines2.c b/citadel/routines2.c
index c0c7478aae286116b00bf24e64ac9894b7463f22..7c5821e7f62a6283f489885a0ffa44939be23cb9 100644 (file)
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -727,11 +727,6 @@ void do_system_configuration(CtdlIPC *ipc)
        strprompt("Minimum number of worker threads", &sc[21][0], 3);
        strprompt("Maximum number of worker threads", &sc[22][0], 3);
 
-       /* no longer applicable ... deprecated
-       strprompt("Server-to-server networking password", &sc[15][0], 19);
-       */
-
-       strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
        strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
        strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
        strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
@@ -775,7 +770,10 @@ void do_system_configuration(CtdlIPC *ipc)
                strprompt("Keep messages for how many days?", buf, 10);
                expirepolicy->expire_value = atol(buf);
        }
+
+       strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
        strprompt("Hour to run purges (0-23)", &sc[31][0], 2);
+
        /* Save it */
        scr_printf("Save this configuration? ");
        if (yesno()) {

diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index 2ef114d4794da676a6afd0aa2150046f0826f3b5..50583c5fc1b70cdab8a6affdebb43c7ef03fa667 100644 (file)
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -269,7 +269,6 @@ void artv_do_export(void) {
        cprintf("%s\n", config.c_sysadm);
        cprintf("%d\n", config.c_setup_level);
        cprintf("%d\n", config.c_maxsessions);
-       cprintf("%s\n", config.c_net_password);
        cprintf("%d\n", config.c_port_number);
        cprintf("%d\n", config.c_ep.expire_mode);
        cprintf("%d\n", config.c_ep.expire_value);
@@ -327,7 +326,6 @@ void artv_import_config(void) {
        lprintf(9, "c_sysadm = %s\n", config.c_sysadm);
        client_gets(buf);       config.c_setup_level = atoi(buf);
        client_gets(buf);       config.c_maxsessions = atoi(buf);
-       client_gets(config.c_net_password);
        client_gets(buf);       config.c_port_number = atoi(buf);
        client_gets(buf);       config.c_ep.expire_mode = atoi(buf);
        client_gets(buf);       config.c_ep.expire_value = atoi(buf);
@@ -553,7 +551,6 @@ void cmd_artv(char *cmdbuf) {
        }
        is_running = 1;
 
-       strcpy(artv_tempfilename1, tmpnam(NULL));
        strcpy(artv_tempfilename2, tmpnam(NULL));
 
        extract(cmd, cmdbuf, 0);

diff --git a/citadel/setup.c b/citadel/setup.c
index 44f9c9f355524e7c79dbd09f3f59df3623a37d89..396566ef5ec52b7aa9156c8d4ccf9f76125fe65a 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -901,8 +901,6 @@ int main(int argc, char *argv[])
                strcpy(config.c_moreprompt, "<more>");
        if (strlen(config.c_twitroom) == 0)
                strcpy(config.c_twitroom, "Trashcan");
-       if (strlen(config.c_net_password) == 0)
-               strcpy(config.c_net_password, "netpassword");
        if (strlen(config.c_baseroom) == 0)
                strcpy(config.c_baseroom, "Lobby");
        if (strlen(config.c_aideroom) == 0)

diff --git a/citadel/techdoc/session.txt b/citadel/techdoc/session.txt
index f9fcdae24c0202141efea8385e65914ab73ecb8b..842f3d92951ef06dfde368c47ae104cc1704c5f1 100644 (file)
--- a/citadel/techdoc/session.txt
+++ b/citadel/techdoc/session.txt
@@ -1254,13 +1254,13 @@ images which are likely to exist on most servers:
                 opposed to the floor picture's use in a floor listing).
 
 
- NETP   (authenticate as network session with system NET Password)
+ NETP   (authenticate as network session with connection NET Password)
 
  This command is used by client software to identify itself as a transport
 session for IGnet/Open BBS to BBS networking.  It should be called with
-two arguments: the node name of the calling system, and the system net
-password for the server.  If the authentication succeeds, NETP will return
-OK, otherwise, it returns ERROR.
+two arguments: the node name of the calling system, and the "shared secret"
+password for that connection.  If the authentication succeeds, NETP will
+return OK, otherwise, it returns ERROR.
 
 
  NUOP   (Network Upload OPen file)
@@ -1741,7 +1741,7 @@ fails for any reason, ERROR is returned.
  13. Geographic location of this system
  14. Name of the system administrator
  15. Number of maximum concurrent sessions allowed on the server
- 16. Password for server-to-server networking
+ 16. (placeholder -- this field is no longer in use)
  17. Default purge time (in days) for users
  18. Default purge time (in days) for rooms
  19. Name of room to log express messages to (or a zero-length name for none)