Sanitizing inputs on auth.c

[citadel.git] / citadel / auth.c

diff --git a/citadel/auth.c b/citadel/auth.c
index d2061a8cb7f17fbd40f3a42df4e00c7b79a7d19f..248b74bbea3162a2963e7a5ab8b3366fe0cff27a 100644 (file)
--- a/citadel/auth.c
+++ b/citadel/auth.c
@@ -1,26 +1,17 @@
 /*
- * $Id$
- *
  * system-level password checking for host auth mode
  * by Nathan Bryant, March 1999
  * updated by Trey van Riper, June 2005
  *
- * Copyright (c) 1999-2009 by the citadel.org team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * Copyright (c) 1999-2016 by the citadel.org team
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #if defined(__linux) || defined(__sun) /* needed for crypt(): */
@@ -100,6 +91,10 @@ static int conv(int num_msg, const struct pam_message **msg,
 
 int validate_password(uid_t uid, const char *pass)
 {
+       if (pass == NULL) {
+               return(0);
+       }
+
 #ifdef HAVE_PAM_START
        struct pam_conv pc;
        struct appdata data;
@@ -113,42 +108,49 @@ int validate_password(uid_t uid, const char *pass)
 #endif
        struct passwd *pw;
        int retval = 0;
-       int flags = 0;
-
-       flags = 0;      /* silences compiler warning */
 
-#ifdef PAM_DATA_SILENT
-       flags = ( flags | PAM_DATA_SILENT ) ;
-#endif /* PAM_DATA_SILENT */
-       if ((pw = getpwuid(uid)) == NULL) {
+       pw = getpwuid(uid);
+       if (pw == NULL) {
                return retval;
        }
 
 #ifdef HAVE_PAM_START
+
+#ifdef PAM_DATA_SILENT
+       int flags = PAM_DATA_SILENT;
+#else
+       int flags = 0;
+#endif
+
        pc.conv = conv;
        pc.appdata_ptr = &data;
        data.name = pw->pw_name;
        data.pw = pass;
        if (pam_start("citadel", pw->pw_name, &pc, &ph) != PAM_SUCCESS)
-               return retval;
+               return(0);
 
-       if ((i = pam_authenticate(ph, flags)) == PAM_SUCCESS)
-               if ((i = pam_acct_mgmt(ph, flags)) == PAM_SUCCESS)
+       if ((i = pam_authenticate(ph, flags)) == PAM_SUCCESS) {
+               if ((i = pam_acct_mgmt(ph, flags)) == PAM_SUCCESS) {
                        retval = -1;
+               }
+       }
 
        pam_end(ph, i | flags);
 #else
        crypted_pwd = pw->pw_passwd;
 
 #ifdef HAVE_GETSPNAM
-       if ((sp = getspnam(pw->pw_name)) != NULL)
+       if (pw == NULL) return(0);
+       if (pw->pw_name == NULL) return(0);
+       if ((sp = getspnam(pw->pw_name)) != NULL) {
                crypted_pwd = sp->sp_pwdp;
+       }
 #endif
 
-       if (!strcmp(crypt(pass, crypted_pwd), crypted_pwd))
+       if (!strcmp(crypt(pass, crypted_pwd), crypted_pwd)) {
                retval = -1;
+       }
 #endif                         /* HAVE_PAM_START */
 
        return retval;
 }
-