* by Nathan Bryant, March 1999
* updated by Trey van Riper, June 2005
*
- * Copyright (c) 1999-2009 by the citadel.org team
+ * Copyright (c) 1999-2016 by the citadel.org team
*
* This program is open source 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.
+ * 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.
- *
- * 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
*/
#if defined(__linux) || defined(__sun) /* needed for crypt(): */
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;
#endif
struct passwd *pw;
int retval = 0;
- int flags = 0;
-#ifdef PAM_DATA_SILENT
- flags = PAM_DATA_SILENT;
-#else
- flags = 0;
-#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;