X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fauth.c;h=74fa9ebc321b6814ac3bab1bed45e6095b41d6a2;hb=6420052874cd23030b27457c1245b1bf54468e01;hp=3a9dbf481140a0cc89e3626d971400c7886a68d3;hpb=db4bd92400cbe8149f33991e98fd58d20c088736;p=citadel.git diff --git a/citadel/auth.c b/citadel/auth.c index 3a9dbf481..74fa9ebc3 100644 --- a/citadel/auth.c +++ b/citadel/auth.c @@ -1,10 +1,17 @@ /* - * $Id$ - * - * system-level password checking for autologin + * 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 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(): */ @@ -78,11 +85,11 @@ static int conv(int num_msg, const struct pam_message **msg, /* - * validpw(): check that `pass' is the correct password for `uid' - * returns zero if no, nonzero if yes + * check that `pass' is the correct password for `uid' + * returns zero if no, nonzero if yes */ -int validpw(uid_t uid, const char *pass) +int validate_password(uid_t uid, const char *pass) { #ifdef HAVE_PAM_START struct pam_conv pc; @@ -97,18 +104,19 @@ int validpw(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) { return retval; } #ifdef HAVE_PAM_START + +#ifdef PAM_DATA_SILENT + int flags = PAM_DATA_SILENT; +#else + int flags = 0; +#endif /* PAM_DATA_SILENT */ + pc.conv = conv; pc.appdata_ptr = &data; data.name = pw->pw_name; @@ -135,4 +143,3 @@ int validpw(uid_t uid, const char *pass) return retval; } -