diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 16:56:28 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 16:56:28 +1100 |
commit | dbb631cebe0108bae40ff73fd67f9873abed5cd5 (patch) | |
tree | 5fea410ecbbe9a0a4f912ea9ae4a140b4c1c78a2 | |
parent | f5ebfe9f68ab32adaa1d5ac3418eba838fed5f92 (diff) |
- (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | openbsd-compat/readpassphrase.c | 6 |
2 files changed, 3 insertions, 6 deletions
@@ -25,6 +25,7 @@ | |||
25 | Removal of rcsid, will no longer strlcpy parts of the string. | 25 | Removal of rcsid, will no longer strlcpy parts of the string. |
26 | - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5. | 26 | - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5. |
27 | - (dtucker) [openbsd-compat/strtoul.c] Update from OpenBSD 1.5 -> 1.7. | 27 | - (dtucker) [openbsd-compat/strtoul.c] Update from OpenBSD 1.5 -> 1.7. |
28 | - (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18. | ||
28 | 29 | ||
29 | 20051105 | 30 | 20051105 |
30 | - (djm) OpenBSD CVS Sync | 31 | - (djm) OpenBSD CVS Sync |
@@ -3267,4 +3268,4 @@ | |||
3267 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3268 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3268 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3269 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3269 | 3270 | ||
3270 | $Id: ChangeLog,v 1.3968 2005/11/10 05:48:10 dtucker Exp $ | 3271 | $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 @@ | |||
1 | /* $OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $ */ | 1 | /* $OpenBSD: readpassphrase.c,v 1.18 2005/08/08 08:05:34 espie Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000-2002 Todd C. Miller <Todd.Miller@courtesan.com> | 4 | * Copyright (c) 2000-2002 Todd C. Miller <Todd.Miller@courtesan.com> |
@@ -22,10 +22,6 @@ | |||
22 | 22 | ||
23 | /* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */ | 23 | /* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */ |
24 | 24 | ||
25 | #if defined(LIBC_SCCS) && !defined(lint) | ||
26 | static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $"; | ||
27 | #endif /* LIBC_SCCS and not lint */ | ||
28 | |||
29 | #include "includes.h" | 25 | #include "includes.h" |
30 | 26 | ||
31 | #ifndef HAVE_READPASSPHRASE | 27 | #ifndef HAVE_READPASSPHRASE |