another Tru64 patch from Burkhard Schmidt

diff --git a/ChangeLog b/ChangeLog
index 123ef71bea6efe0db7cf7507ded02bf1b832d1b6..46e480cabad25fe73ffc450b7452ca2d2ce3bea5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-($Id: ChangeLog,v 1.37 2001-05-22 19:13:36 rufustfirefly Exp $)
+($Id: ChangeLog,v 1.38 2001-05-25 13:23:55 rufustfirefly Exp $)
+
+2001-05-25  jeff b  <jeff@univrel.pr.uconn.edu>
+       * etc/uams/uams_passwd.c: another Tru64 fix from Burkhard
+       Schmidt <bs@cpfs.mpg.de>
 
 2001-05-22  jeff b  <jeff@univrel.pr.uconn.edu>
        * configure.in, etc/afpd/unix.h: more portability fixes, and

diff --git a/etc/uams/uams_passwd.c b/etc/uams/uams_passwd.c
index bb30b3b09edc81ba5beb9868dac5b58575d979d1..94c50cb3d4c409680c7643b9415bae0e672301ca 100644 (file)
--- a/etc/uams/uams_passwd.c
+++ b/etc/uams/uams_passwd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_passwd.c,v 1.9 2001-05-22 19:13:36 rufustfirefly Exp $
+ * $Id: uams_passwd.c,v 1.10 2001-05-25 13:23:56 rufustfirefly Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -98,16 +98,14 @@ static int passwd_login(void *obj, struct passwd **uam_pwd,
         struct pr_passwd *pr = getprpwnam( pwd->pw_name );
         if ( pr == NULL )
             return AFPERR_NOTAUTH;
-        if ( strcmp( dispcrypt( rbuf, pr->ufld.fd_encrypt,
+        if ( strcmp( dispcrypt( ibuf, pr->ufld.fd_encrypt,
             pr->ufld.fd_oldcrypt ), pr->ufld.fd_encrypt ) == 0 ) {
             return AFP_OK;
         }
     } else {
-        p = crypt( rbuf, pwd->pw_passwd );
-        memset(rbuf, 0, PASSWDLEN);
-        if ( strcmp( p, pwd->pw_passwd ) == 0 ) {
+        p = crypt( ibuf, pwd->pw_passwd );
+        if ( strcmp( p, pwd->pw_passwd ) == 0 )
             return AFP_OK;
-        }
     }
 #else /* TRU64 */
     p = crypt( ibuf, pwd->pw_passwd );