1. If not building with PAM, kcheckpass relies on HAVE_SHADOW to decide
whether to support shadow passwords. However, this was only set if also
building tdm.
Consolidate all PAM/shadow configure checks at the top level so these are
always set correctly.
2. Consolidate /etc/passwd and shadow password handling
The shadow password handler already completely handles /etc/passwd
passwords as well, so having a separate handler for just /etc/passwd is
pure code duplication.
Signed-off-by: Bobby Bingham <koorogi@koorogi.info>
(cherry picked from commit 8c543e26ec)
r14.1.x
Bobby Bingham
parent
5b795608e0
commit
61357f5f74
GPG Key ID:
2A75B7CA8ADED5CF
@ -1,60 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1998 Christian Esken <esken@kde.org>
|
||||
* Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
|
||||
*
|
||||
* 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 2 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.
|
||||
*
|
||||
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* Copyright (C) 1998, Christian Esken <esken@kde.org>
|
||||
*/
|
||||
|
||||
#include "kcheckpass.h"
|
||||
|
||||
#ifdef HAVE_ETCPASSWD
|
||||
|
||||
/*******************************************************************
|
||||
* This is the authentication code for /etc/passwd passwords
|
||||
*******************************************************************/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
AuthReturn Authenticate(const char *method,
|
||||
const char *login, char *(*conv) (ConvRequest, const char *))
|
||||
{
|
||||
struct passwd *pw;
|
||||
char *passwd;
|
||||
|
||||
if (strcmp(method, "classic"))
|
||||
return AuthError;
|
||||
|
||||
/* Get the password entry for the user we want */
|
||||
if (!(pw = getpwnam(login)))
|
||||
return AuthBad;
|
||||
|
||||
if (!*pw->pw_passwd)
|
||||
return AuthOk;
|
||||
|
||||
if (!(passwd = conv(ConvGetHidden, 0)))
|
||||
return AuthAbort;
|
||||
|
||||
if (!strcmp(pw->pw_passwd, crypt(passwd, pw->pw_passwd))) {
|
||||
dispose(passwd);
|
||||
return AuthOk; /* Success */
|
||||
}
|
||||
dispose(passwd);
|
||||
return AuthBad; /* Password wrong or account locked */
|
||||
}
|
||||
|
||||
#endif
|
||||
Loading…
Reference in new issue