hurd/libshouldbeinlibc ChangeLog idvec-verify.c

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/08/06 07:07:26

Modified files:
        libshouldbeinlibc: ChangeLog idvec-verify.c 

Log message:
        2003-08-06  Jeroen Dekkers  <address@hidden>
        
        * idvec-verify.c: Remove #pragma weak crypt.
        (verify_passwd): Don't check if crypt exist.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/libshouldbeinlibc/ChangeLog.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/libshouldbeinlibc/idvec-verify.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: hurd/libshouldbeinlibc/ChangeLog
diff -u hurd/libshouldbeinlibc/ChangeLog:1.83 
hurd/libshouldbeinlibc/ChangeLog:1.84
--- hurd/libshouldbeinlibc/ChangeLog:1.83       Tue Aug  5 19:42:31 2003
+++ hurd/libshouldbeinlibc/ChangeLog    Wed Aug  6 07:07:26 2003
@@ -1,3 +1,8 @@
+2003-08-06  Jeroen Dekkers  <address@hidden>
+
+       * idvec-verify.c: Remove #pragma weak crypt.
+       (verify_passwd): Don't check if crypt exist.
+
 2003-08-03  Marco Gerards  <address@hidden>
 
        * idvec-verify.c: Include <crypt.h>.
Index: hurd/libshouldbeinlibc/idvec-verify.c
diff -u hurd/libshouldbeinlibc/idvec-verify.c:1.9 
hurd/libshouldbeinlibc/idvec-verify.c:1.10
--- hurd/libshouldbeinlibc/idvec-verify.c:1.9   Tue Aug  5 19:42:31 2003
+++ hurd/libshouldbeinlibc/idvec-verify.c       Wed Aug  6 07:07:26 2003
@@ -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 <address@hidden>
 
    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 @@
   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;