No more pwcrypt

diff --git a/citadel/citadel.h b/citadel/citadel.h
index f4e2fdb9db9c13ef58b2a2aa8395ccb6f8bc11aa..0c5ef74bb229eb1770fd8002dc0470f94cb28087 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -32,7 +32,6 @@ struct config {
        char c_humannode[21];           /* Long name of system              */
        char c_phonenum[16];            /* Dialup number of system          */
        int c_bbsuid;                   /* UID of the bbs-only user         */
-       int c_pwcrypt;                  /* password encryption seed         */
        char c_creataide;               /* room creator = room aide  flag   */
        int c_sleeping;                 /* watchdog timer setting           */
        char c_initax;                  /* initial access level             */
@@ -58,7 +57,6 @@ struct config {
 #define HUMANNODE              config.c_humannode
 #define PHONENUM               config.c_phonenum
 #define BBSUID                 config.c_bbsuid
-#define PWCRYPT                        config.c_pwcrypt
 #define CREATAIDE              config.c_creataide
 #define INITAX                 config.c_initax
 #define REGISCALL              config.c_regiscall

diff --git a/citadel/setup.c b/citadel/setup.c
index e30b421ac6a2d60ecae593bd6448f4c0c9e0d6fa..467ba3391bc0a8093887b2ddbde2489ee05f9fc9 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -28,7 +28,7 @@
 #include CURSES_INC
 #endif
 
-#define MAXSETUP 20
+#define MAXSETUP 19
 
 #define UI_TEXT                0       /* Default setup type -- text only */
 #define UI_DIALOG      1       /* Use the 'dialog' program */
@@ -50,7 +50,6 @@ char *setup_titles[] = {
        "BBS City and State",
        "System Administrator",
        "BBS User ID",
-       "Password encryption seed",
        "'Room Creator = Room Aide' flag",
        "Server timeout period",
        "Initial access level",
@@ -116,14 +115,6 @@ char *setup_text[] = {
 "under this user ID.  Please specify that (numeric) user ID here.",
 
 "8",
-"Citadel uses a (very) simple password encryption scheme",
-"to thwart breakins that could occur if someone snatched",
-"a copy of your userlog.  This parameter is part of the",
-"algorithm, so that the code can be different on each",
-"system.  Once it has been set, DO NOT change it --",
-"otherwise no one will be able to log in!",
-
-"9",
 "This is a boolean value.  If you set it to 1, anyone who",
 "creates a class 3 (passworded) or class 4 (invitation",
 "only) room will automatically become the Room Aide for",
@@ -132,7 +123,7 @@ char *setup_text[] = {
 "some systems, and not so well on others.  Set this to 0 to",
 "disable this function.",
 
-"10",
+"9",
 "This setting specifies how long a server session may sit idle before it is",
 "automatically terminated.  The recommended value is 900 seconds (15",
 "minutes).  Note that this has *nothing* to do with any watchdog timer that",
@@ -141,7 +132,7 @@ char *setup_text[] = {
 "You MUST set this to a reasonable value.  Setting it to zero will cause",
 "the server to malfunction.",
 
-"11",
+"10",
 "This is the access level new users are assigned.",
 "",
 "The most common settings for this will be either 1, for",
@@ -150,7 +141,7 @@ char *setup_text[] = {
 "boards!), or 4, for systems which give instant access.",
 "The current access levels available are:",
 
-"12",
+"11",
 "'Registration' refers to the boring part of logging into a BBS for the first",
 "time: typing your name, address, and telephone number.  Set this value to 1",
 "to automatically do registration for new users, or 0 to not auto-register.",
@@ -159,7 +150,7 @@ char *setup_text[] = {
 "value is 1 if you've set your inital access level to 1, or 0 if you've set",
 "your initial access level to something higher.",
 
-"13",
+"12",
 "Every BBS has its share of problem users.  This is one",
 "good way to deal with them: if you enable this option,",
 "anyone you flag as a 'problem user' (access level 2) can",
@@ -167,24 +158,24 @@ char *setup_text[] = {
 "automatically moved to a room of your choosing.  Set this",
 "value to 1 to enable Twit Detect, or 0 to disable it.",
 
-"14",
+"13",
 "This is the name of the room that problem user messages",
 "get moved to if you have Twit Detect enabled.",
 "(Note: don't forget to *create* this room!)",
 
-"15",
+"14",
 "This is the maximum number of concurrent Citadel sessions which may be",
 "running at any given time.  Use this to keep very busy systems from being",
 "overloaded.",
 "  Set this value to 0 to allow an unlimited number of sessions.",
 
-"16",
+"15",
 "This is the prompt that appears after each screenful of",
 "text - for users that have chosen that option.  Usually",
 "a simple '<more>' will do, but some folks like to be",
 "creative...",
 
-"17",
+"16",
 "If you have a gateway set up to allow Citadel users to",
 "send Internet mail, with sendmail, qmail, or whatever, and",
 "you wish to restrict this to only users to whom you have",
@@ -193,24 +184,25 @@ char *setup_text[] = {
 "(Obviously, if your system doesn't have the ability to",
 "send mail to the outside world, this is all irrelevant.)",
 
-"18",
+"17",
 "Select the name of a subdirectory (relative to the main",
 "Citadel directory - do not type an absolute pathname!) in",
 "which to place arriving file transfers that otherwise",
 "don't have a home.",
 
-"19",
+"18",
 "If you use Citadel client/server sessions to transport network spool data",
 "between systems, this is the password other systems will use to authenticate",
 "themselves as network nodes rather than regular callers.",
 
-"20",
+"19",
 "Specify the TCP port number on which your server will run.  Normally, this",
 "will be port 504, which is the official port assigned by the IANA for",
 "Citadel servers.  You'll only need to specify a different port number if",
 "you run multiple BBS's on the same computer and there's something else",
 "already using port 504.",
 
+"20",
 "21",
 "22",
 "23",
@@ -816,49 +808,43 @@ case 7:
        set_int_val(curr, &config.c_bbsuid);
        break;
 
-/*
 case 8:
-       set_int_val(curr, &config.c_pwcrypt);
-       break;
-*/
-
-case 9:
        set_char_val(curr, &config.c_creataide);
        break;
 
-case 10:
+case 9:
        set_int_val(curr, &config.c_sleeping);
        break;
 
-case 11:
+case 10:
        set_char_val(curr, &config.c_initax);
        break;
 
-case 12:
+case 11:
        set_char_val(curr, &config.c_regiscall);
        break;
 
-case 13:
+case 12:
        set_char_val(curr, &config.c_twitdetect);
        break;
 
-case 14:
+case 13:
        set_str_val(curr, config.c_twitroom);
        break;
 
-case 15:
+case 14:
        set_int_val(curr, &config.c_maxsessions);
        break;
 
-case 16:
+case 15:
        set_str_val(curr, config.c_moreprompt);
        break;
 
-case 17:
+case 16:
        set_char_val(curr, &config.c_restrict);
        break;
 
-case 18:
+case 17:
        set_str_val(curr, config.c_bucket_dir);
        config.c_bucket_dir[14] = 0;
        for (a=0; a<strlen(config.c_bucket_dir); ++a)
@@ -867,11 +853,11 @@ case 18:
                                &config.c_bucket_dir[a+1]);
        break;
 
-case 19:
+case 18:
        set_str_val(curr, config.c_net_password);
        break;
 
-case 20:
+case 19:
        set_int_val(curr, &config.c_port_number);
        break;
 

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index b21f387f488aafa7338249569024acb258733781..922d5db667119c187320a364d075761588eceaf5 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -19,16 +19,6 @@
 extern struct config config;
 
 
-/*
- * pwcrypt()  -  simple password encryption (not in use)
-void pwcrypt(char *text, int code)
-{
-       int a;
-       for (a=0; a<strlen(text); ++a) text[a]=(text[a]^(((code|128)^a)&0xFF));
-       }
- */
-
-
 /*
  * hash()  -  hash table function for user lookup
  */
@@ -288,10 +278,8 @@ void cmd_pass(char *buf)
        code = (-1);
        if (CC->usersupp.USuid == BBSUID) {
                strproc(password);
-               /* pwcrypt(CC->usersupp.password,config.c_pwcrypt); */
                strproc(CC->usersupp.password);
                code = strucmp(CC->usersupp.password,password);
-               /* pwcrypt(CC->usersupp.password,config.c_pwcrypt); */
                }
        else {
                p = (struct passwd *)getpwuid(CC->usersupp.USuid);
@@ -302,7 +290,6 @@ void cmd_pass(char *buf)
                                code = 0;
                                lgetuser(&CC->usersupp, CC->curr_user);
                                strcpy(CC->usersupp.password, password);
-                               /* pwcrypt(CC->usersupp.password, config.c_pwcrypt); */
                                lputuser(&CC->usersupp, CC->curr_user);
                                }
                        }
@@ -519,7 +506,6 @@ void cmd_setp(char *new_pw)
                }
        lgetuser(&CC->usersupp,CC->curr_user);
        strcpy(CC->usersupp.password,new_pw);
-       /* pwcrypt(CC->usersupp.password,config.c_pwcrypt); */
        lputuser(&CC->usersupp,CC->curr_user);
        cprintf("%d Password changed.\n",OK);
        rec_log(CL_PWCHANGE,CC->curr_user);
@@ -772,7 +758,6 @@ void cmd_greg(char *who)
 
        cprintf("%d %s\n",LISTING_FOLLOWS,usbuf.fullname);
        cprintf("%ld\n",usbuf.usernum);
-       /* pwcrypt(usbuf.password,PWCRYPT); */
        cprintf("%s\n",usbuf.password);
        cprintf("%s\n",usbuf.USname);
        cprintf("%s\n",usbuf.USaddr);
@@ -876,7 +861,6 @@ void cmd_list(void) {
                                usbuf.lastcall,
                                usbuf.timescalled,
                                usbuf.posted);
-                       /* pwcrypt(usbuf.password,config.c_pwcrypt); */
                        if (CC->usersupp.axlevel >= 6) cprintf("%s",usbuf.password);
                        cprintf("\n");
                        }