From dbb631cebe0108bae40ff73fd67f9873abed5cd5 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 10 Nov 2005 16:56:28 +1100 Subject: [PATCH] - (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18. --- ChangeLog | 3 ++- openbsd-compat/readpassphrase.c | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94515aaf5..cd364fd3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ Removal of rcsid, will no longer strlcpy parts of the string. - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5. - (dtucker) [openbsd-compat/strtoul.c] Update from OpenBSD 1.5 -> 1.7. + - (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18. 20051105 - (djm) OpenBSD CVS Sync @@ -3267,4 +3268,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3968 2005/11/10 05:48:10 dtucker Exp $ +$Id: ChangeLog,v 1.3969 2005/11/10 05:56:28 dtucker Exp $ diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index 2c84f8021..919c0174a 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $ */ +/* $OpenBSD: readpassphrase.c,v 1.18 2005/08/08 08:05:34 espie Exp $ */ /* * Copyright (c) 2000-2002 Todd C. Miller @@ -22,10 +22,6 @@ /* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include "includes.h" #ifndef HAVE_READPASSPHRASE