diff options
| author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
| commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
| tree | f64a4ace625514e94759878c0b94ab0a79805bbd /openbsd-compat/readpassphrase.c | |
| parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
| parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) | |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'openbsd-compat/readpassphrase.c')
| -rw-r--r-- | openbsd-compat/readpassphrase.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index eb060bdbf..919c0174a 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */ | 1 | /* $OpenBSD: readpassphrase.c,v 1.18 2005/08/08 08:05:34 espie Exp $ */ |
| 2 | |||
| 3 | /* $OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $ */ | ||
| 4 | 2 | ||
| 5 | /* | 3 | /* |
| 6 | * Copyright (c) 2000-2002 Todd C. Miller <Todd.Miller@courtesan.com> | 4 | * Copyright (c) 2000-2002 Todd C. Miller <Todd.Miller@courtesan.com> |
| @@ -22,9 +20,7 @@ | |||
| 22 | * Materiel Command, USAF, under agreement number F39502-99-1-0512. | 20 | * Materiel Command, USAF, under agreement number F39502-99-1-0512. |
| 23 | */ | 21 | */ |
| 24 | 22 | ||
| 25 | #if defined(LIBC_SCCS) && !defined(lint) | 23 | /* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */ |
| 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 | 24 | ||
| 29 | #include "includes.h" | 25 | #include "includes.h" |
| 30 | 26 | ||