- (djm) Sync with -current openbsd-compat/readpassphrase.c:

   - djm@cvs.openbsd.org 2001/06/27 13:23:30
     typo, spotted by Tom Holroyd <tomh@po.crl.go.jp>; ok deraadt@

diff --git a/ChangeLog b/ChangeLog
index 30e26a0ead0cedadd7e53649c567b91b6b79ba72..8acad3d7bc202f189a1f2594a1e334bfc07614cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
  - (djm) Rename sysconfdir/primes => sysconfdir/moduli
  - (djm) Oops, forgot make logic for primes=>moduli. Also try to rename 
    existing primes->moduli if it exists.
+ - (djm) Sync with -current openbsd-compat/readpassphrase.c:
+   - djm@cvs.openbsd.org 2001/06/27 13:23:30
+     typo, spotted by Tom Holroyd <tomh@po.crl.go.jp>; ok deraadt@
 
 20010625
  - OpenBSD CVS Sync

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 308e7cc5f0b97f2b0b40e9c9c0d47620e83c7e79..10f0e0ed30b3748b34332c5382a12d3fb56e637d 100644 (file)
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -26,7 +26,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.4 2001/06/18 17:41:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.5 2001/06/27 13:23:30 djm Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "includes.h"
@@ -113,7 +113,7 @@ readpassphrase(prompt, buf, bufsiz, flags)
        for (p = buf; read(input, &ch, 1) == 1 && ch != '\n' && ch != '\r';) {
                if (p < end) {
                        if ((flags & RPP_SEVENBIT))
-                               ch = ch &= 0x7f;
+                               ch &= 0x7f;
                        if (isalpha(ch)) {
                                if ((flags & RPP_FORCELOWER))
                                        ch = tolower(ch);