diff options
| author | Marcus Brinkmann <marcus@gnu.org> | 2003-08-06 11:07:26 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <marcus@gnu.org> | 2003-08-06 11:07:26 +0000 |
| commit | 26868aa93185c14a1939ab9b0a4d08bc07f15b6a (patch) | |
| tree | a8b05a3632cb8c456aa4b0f9bbb74a9c55c4b382 /libshouldbeinlibc | |
| parent | e2b4be1e78e30e671147d8487f7002ae072054d6 (diff) | |
2003-08-06 Jeroen Dekkers <jeroen@dekkers.cx>
* idvec-verify.c: Remove #pragma weak crypt.
(verify_passwd): Don't check if crypt exist.
Diffstat (limited to 'libshouldbeinlibc')
| -rw-r--r-- | libshouldbeinlibc/ChangeLog | 5 | ||||
| -rw-r--r-- | libshouldbeinlibc/idvec-verify.c | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/libshouldbeinlibc/ChangeLog b/libshouldbeinlibc/ChangeLog index fd854f6b..c2580202 100644 --- a/libshouldbeinlibc/ChangeLog +++ b/libshouldbeinlibc/ChangeLog @@ -1,3 +1,8 @@ +2003-08-06 Jeroen Dekkers <jeroen@dekkers.cx> + + * idvec-verify.c: Remove #pragma weak crypt. + (verify_passwd): Don't check if crypt exist. + 2003-08-03 Marco Gerards <metgerards@student.han.nl> * idvec-verify.c: Include <crypt.h>. diff --git a/libshouldbeinlibc/idvec-verify.c b/libshouldbeinlibc/idvec-verify.c index 55d20e2c..f8b2f449 100644 --- a/libshouldbeinlibc/idvec-verify.c +++ b/libshouldbeinlibc/idvec-verify.c @@ -1,6 +1,6 @@ /* Verify user passwords - Copyright (C) 1996,97,98,99,2002 Free Software Foundation, Inc. + Copyright (C) 1996,97,98,99,2002,2003 Free Software Foundation, Inc. Written by Miles Bader <miles@gnu.org> This program is free software; you can redistribute it and/or @@ -30,8 +30,6 @@ #define SHADOW_PASSWORD_STRING "x" /* pw_passwd contents for shadow passwd */ -#pragma weak crypt - static error_t verify_id (); /* FWD */ /* Get a password from the user, returning it in malloced storage. */ @@ -70,13 +68,8 @@ verify_passwd (const char *password, if (sys_encrypted[0] == '\0') return 0; /* No password. */ - if (crypt) - /* Encrypt the password entered by the user (SYS_ENCRYPTED is the salt). */ - encrypted = crypt (password, sys_encrypted); - else - /* No crypt on this system! Use plain-text passwords. */ - encrypted = password; - + /* Encrypt the password entered by the user (SYS_ENCRYPTED is the salt). */ + encrypted = crypt (password, sys_encrypted); if (! encrypted) /* Crypt failed. */ return errno; |