* user_ops.c: fix unused variable compiler warnings

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 7215c9c6288303ea5f34e27af521b993f5d4a873..96936001dd7850192c11b23bd6c8b8d797ec4b9b 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 620.8  2004/04/09 23:05:52  error
+ * user_ops.c: fix unused variable compiler warnings
+
  Revision 620.7  2004/04/03 15:42:35  ajc
  * stress.c: include <stdlib.h> in order to get RAND_MAX
    (Submitted by Thomas.Lotterer@cw.com, Cable & Wireless / OpenPKG)
@@ -5664,3 +5667,4 @@ 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/user_ops.c b/citadel/user_ops.c
index 6f2e12eb4f006b4e61f88cfae419500b096a228e..5fe6172bc2b835ba317acce5759666e5bbf77602 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -99,8 +99,8 @@ int getuser(struct ctdluser *usbuf, char name[])
                return(1);
        }
        memcpy(usbuf, cdbus->ptr,
-              ((cdbus->len > sizeof(struct ctdluser)) ?
-               sizeof(struct ctdluser) : cdbus->len));
+                       ((cdbus->len > sizeof(struct ctdluser)) ?
+                        sizeof(struct ctdluser) : cdbus->len));
        cdb_free(cdbus);
 
        return (0);
@@ -352,7 +352,6 @@ int CtdlLoginExistingUser(char *trythisname)
        char username[SIZ];
        int found_user;
        struct recptypes *valid = NULL;
-       struct passwd *p = NULL;
 
        if (trythisname == NULL) return login_not_found;
        safestrncpy(username, trythisname, sizeof username);
@@ -385,7 +384,8 @@ int CtdlLoginExistingUser(char *trythisname)
         * account.
         */
        if (found_user != 0) {
-               p = (struct passwd *) getpwnam(username);
+               struct passwd *p = (struct passwd *) getpwnam(username);
+
                if (p != NULL) {
                        create_user(username, 0);
                        found_user = getuser(&CC->user, username);
@@ -776,7 +776,6 @@ int create_user(char *newusername, int become_user)
 {
        struct ctdluser usbuf;
        struct ctdlroom qrbuf;
-       struct passwd *p = NULL;
        char username[SIZ];
        char mailboxname[ROOMNAMELEN];
        uid_t uid;
@@ -785,12 +784,15 @@ int create_user(char *newusername, int become_user)
        strproc(username);
 
 #ifdef ENABLE_AUTOLOGIN
-       p = (struct passwd *) getpwnam(username);
-       if (p != NULL) {
-               extract_token(username, p->pw_gecos, 0, ',');
-               uid = p->pw_uid;
-       } else {
-               uid = (-1);
+       {
+               struct passwd *p = (struct passwd *) getpwnam(username);
+
+               if (p != NULL) {
+                       extract_token(username, p->pw_gecos, 0, ',');
+                       uid = p->pw_uid;
+               } else {
+                       uid = (-1);
+               }
        }
 #else
        uid = (-1);