* eliminate redundant "name" parameter in [l]putuser(), now uses

	  usbuf->fullname to guarantee the correct name for the index

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index d9fe896ae4d39dfc22797c4c0106368bff2f8e2b..3fcd89c29a79d807a9b7fd1338343f8a49e699cd 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 15 22:57:32 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * eliminate redundant "name" parameter in [l]putuser(), now uses
+         usbuf->fullname to guarantee the correct name for the index
+
 1999-07-12 Nathan Bryant <bryant@cs.usm.maine.edu>
        * Makefile.in, configure.in: link netproc with gdbm
        * netproc.c: only include gdbm.h if HAVE_GDBM_H

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index dadf85861401442f368ca88274d412667abd3ae9..569bf5a9ae9c930293e7efdb61e8710cc9cc5829 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -992,7 +992,7 @@ void save_message(char *mtmp,       /* file containing proper message */
        /* Bump this user's messages posted counter. */
        lgetuser(&CC->usersupp, CC->curr_user);
        CC->usersupp.posted = CC->usersupp.posted + 1;
-       lputuser(&CC->usersupp, CC->curr_user);
+       lputuser(&CC->usersupp);
 
        /* If this is private, local mail, make a copy in the
         * recipient's mailbox and bump the reference count.

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index d6a37b282fc57fb6da2956d8a73c0036f0e05e23..649b38b4e17009743d887851b8e01863fac1ce28 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -740,7 +740,7 @@ void usergoto(char *where, int display_result)
                vbuf.v_flags = vbuf.v_flags | V_ACCESS;
        }
        CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
-       lputuser(&CC->usersupp, CC->curr_user);
+       lputuser(&CC->usersupp);
 
        /* check for new mail */
        newmailcount = NewMailCount();
@@ -775,6 +775,7 @@ void usergoto(char *where, int display_result)
        if (CC->quickroom.QRflags & QR_MAILBOX) {
                strcpy(truncated_roomname, &truncated_roomname[11]);
        }
+
        if (display_result)
                cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d\n",
                        OK, check_express(),
@@ -783,7 +784,8 @@ void usergoto(char *where, int display_result)
                        info, CC->quickroom.QRflags,
                        CC->quickroom.QRhighest,
                        vbuf.v_lastseen,
-                       rmailflag, raideflag, newmailcount, CC->quickroom.QRfloor);
+                       rmailflag, raideflag, newmailcount,
+                       CC->quickroom.QRfloor);
 
        set_wtmpsupp_to_current_room();
 }
@@ -806,6 +808,7 @@ void cmd_goto(char *gargs)
                cprintf("%d not logged in\n", ERROR + NOT_LOGGED_IN);
                return;
        }
+
        extract(towhere, gargs, 0);
        extract(password, gargs, 1);
 
@@ -831,6 +834,7 @@ void cmd_goto(char *gargs)
                if (c == 0)
                        strcpy(towhere, augmented_roomname);
        }
+
        /* And if the room was found... */
        if (c == 0) {
 
@@ -839,6 +843,7 @@ void cmd_goto(char *gargs)
                        usergoto(towhere, 1);
                        return;
                }
+
                /* See if there is an existing user/room relationship */
                ra = CtdlRoomAccess(&QRscratch, &CC->usersupp);
 
@@ -865,7 +870,8 @@ void cmd_goto(char *gargs)
                        }
                }
        }
-      NOPE:cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere);
+
+NOPE:  cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere);
 }
 
 
@@ -1351,7 +1357,7 @@ unsigned create_room(char *new_room_name,
        vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
        vbuf.v_flags = vbuf.v_flags | V_ACCESS;
        CtdlSetRelationship(&vbuf, &CC->usersupp, &qrbuf);
-       lputuser(&CC->usersupp, CC->curr_user);
+       lputuser(&CC->usersupp);
 
        /* resume our happy day */
        return (qrbuf.QRflags);

diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index 155f213b14d5beaa90dd37f05b63fe93f09c5395..a91c30bc777aa9f4d9d50253db360ac0539a130e 100644 (file)
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -284,7 +284,7 @@ void import_a_user(void) {
                        }
                }
        
-       putuser(&us, us.fullname);
+       putuser(&us);
 
        lprintf(9, "\n");
        }

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 46989fa115b15c3ebc88b1d04b906cd4832d79f9..e627c16d08888faf5da0e45bf0313d71339e0330 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -84,14 +84,14 @@ int lgetuser(struct usersupp *usbuf, char *name)
 /*
  * putuser()  -  write user buffer into the correct place on disk
  */
-void putuser(struct usersupp *usbuf, char *name)
+void putuser(struct usersupp *usbuf)
 {
        char lowercase_name[32];
        int a;
 
-       for (a=0; a<=strlen(name); ++a) {
+       for (a=0; a<=strlen(usbuf->fullname); ++a) {
                if (a < sizeof(lowercase_name))
-                       lowercase_name[a] = tolower(name[a]);
+                       lowercase_name[a] = tolower(usbuf->fullname[a]);
                }
        lowercase_name[sizeof(lowercase_name)-1] = 0;
 
@@ -105,8 +105,8 @@ void putuser(struct usersupp *usbuf, char *name)
 /*
  * lputuser()  -  same as putuser() but locks the record
  */
-void lputuser(struct usersupp *usbuf, char *name) {
-       putuser(usbuf,name);
+void lputuser(struct usersupp *usbuf) {
+       putuser(usbuf);
        end_critical_section(S_USERSUPP);
        }
 
@@ -313,7 +313,7 @@ void session_startup(void) {
                CC->usersupp.axlevel = 6;
                }
 
-       lputuser(&CC->usersupp,CC->curr_user);
+       lputuser(&CC->usersupp);
 
         /* Run any cleanup routines registered by loadable modules */
        PerformSessionHooks(EVT_LOGIN);
@@ -436,7 +436,7 @@ void cmd_pass(char *buf)
                        lgetuser(&CC->usersupp, CC->curr_user);
                        safestrncpy(CC->usersupp.password, password,
                                    sizeof CC->usersupp.password);
-                       lputuser(&CC->usersupp, CC->curr_user);
+                       lputuser(&CC->usersupp);
                        }
                }
 #endif
@@ -487,7 +487,7 @@ int purge_user(char pname[]) {
        if (user_is_logged_in == 1) {
                lprintf(5, "User <%s> is logged in; not deleting.\n", pname);
                usbuf.axlevel = 0;
-               putuser(&usbuf, pname);
+               putuser(&usbuf);
                return(1);
                }
 
@@ -576,7 +576,7 @@ int create_user(char *newusername)
                }
 
        /* add user to userlog */
-       putuser(&CC->usersupp,CC->curr_user);
+       putuser(&CC->usersupp);
        if (getuser(&CC->usersupp,CC->curr_user)) {
                return(ERROR+INTERNAL_ERROR);
                }
@@ -669,7 +669,7 @@ void cmd_setp(char *new_pw)
                }
        lgetuser(&CC->usersupp,CC->curr_user);
        strcpy(CC->usersupp.password,new_pw);
-       lputuser(&CC->usersupp,CC->curr_user);
+       lputuser(&CC->usersupp);
        cprintf("%d Password changed.\n",OK);
        rec_log(CL_PWCHANGE,CC->curr_user);
        PerformSessionHooks(EVT_SETPASS);
@@ -712,7 +712,7 @@ void cmd_setu(char *new_parms)
        CC->usersupp.flags = CC->usersupp.flags & (~US_USER_SET);
        CC->usersupp.flags = CC->usersupp.flags | 
                (extract_int(new_parms,2) & US_USER_SET);
-       lputuser(&CC->usersupp,CC->curr_user);
+       lputuser(&CC->usersupp);
        cprintf("%d Ok\n",OK);
        }
 
@@ -742,7 +742,7 @@ void cmd_slrp(char *new_ptr)
        vbuf.v_lastseen = newlr;
        CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
 
-       lputuser(&CC->usersupp, CC->curr_user);
+       lputuser(&CC->usersupp);
        cprintf("%d %ld\n",OK,newlr);
        }
 
@@ -787,7 +787,7 @@ void cmd_invt_kick(char *iuser, int op)
 
        CtdlSetRelationship(&vbuf, &USscratch, &CC->quickroom);
 
-       lputuser(&USscratch,iuser);
+       lputuser(&USscratch);
 
        /* post a message in Aide> saying what we just did */
        sprintf(bbb,"%s %s %s> by %s",
@@ -828,7 +828,7 @@ void cmd_forg(void) {
        vbuf.v_flags = vbuf.v_flags & ~V_ACCESS;
 
        CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
-       lputuser(&CC->usersupp,CC->curr_user);
+       lputuser(&CC->usersupp);
        cprintf("%d Ok\n",OK);
        usergoto(BASEROOM, 0);
        }
@@ -980,7 +980,7 @@ void cmd_vali(char *v_args)
        userbuf.axlevel = newax;
        userbuf.flags = (userbuf.flags & ~US_NEEDVALID);
 
-       lputuser(&userbuf,user);
+       lputuser(&userbuf);
 
        /* If the access level was set to zero, delete the user */
        if (newax == 0) {
@@ -1121,7 +1121,7 @@ void cmd_regi(void) {
        strcpy(CC->usersupp.USphone,tmpphone);
        strcpy(CC->usersupp.USemail,tmpemail);
        CC->usersupp.flags=(CC->usersupp.flags|US_REGIS|US_NEEDVALID);
-       lputuser(&CC->usersupp,CC->curr_user);
+       lputuser(&CC->usersupp);
 
        /* set global flag calling for validation */
        begin_critical_section(S_CONTROL);
@@ -1328,7 +1328,7 @@ void cmd_asup(char *cmdbuf) {
                usbuf.USuserpurge = extract_int(cmdbuf, 8);
                }
 
-       lputuser(&usbuf, requested_user);
+       lputuser(&usbuf);
        if (usbuf.axlevel == 0) {
                if (purge_user(requested_user)==0) {
                        cprintf("%d %s deleted.\n", OK, requested_user);

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index c765ab52eea283f7354b61630c439e1268303fcc..d804514ea0b9fea494557dca4ab25fac027d6815 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -1,9 +1,9 @@
 /* $Id$ */
 int hash (char *str);
-int getuser (struct usersupp *usbuf, char *name);
-int lgetuser (struct usersupp *usbuf, char *name);
-void putuser (struct usersupp *usbuf, char *name);
-void lputuser (struct usersupp *usbuf, char *name);
+int getuser (struct usersupp *, char *);
+int lgetuser (struct usersupp *, char *);
+void putuser (struct usersupp *);
+void lputuser (struct usersupp *);
 int is_aide (void);
 int is_room_aide (void);
 int getuserbynumber (struct usersupp *usbuf, long int number);