summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-05-06 18:01:43 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-05-06 18:01:43 +0000
commitf278613f5e3f6d3577a21004c09ef4a2f720bbb5 (patch)
tree06fed08c99bf06970a1b7aba3f67146143bab1bd
parentaafff9cc7619d238e27500d0e4d2e4ea0fa140e1 (diff)
- (bal) CVS ID updates for readpass.c, readpass.h, cli.c, and cli.h
-rw-r--r--ChangeLog3
-rw-r--r--cli.c4
-rw-r--r--cli.h11
-rw-r--r--readpass.c2
-rw-r--r--readpass.h2
5 files changed, 11 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fd3e7b5d..6e4e82b77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
4 Suggested by Jason Mader <jason@ncac.gwu.edu> 4 Suggested by Jason Mader <jason@ncac.gwu.edu>
5 - (bal) White Space and #ifdef sync with OpenBSD 5 - (bal) White Space and #ifdef sync with OpenBSD
6 - (bal) Add 'seed_rng()' to ssh-add.c 6 - (bal) Add 'seed_rng()' to ssh-add.c
7 - (bal) CVS ID updates for readpass.c, readpass.h, cli.c, and cli.h
7 - OpenBSD CVS Sync 8 - OpenBSD CVS Sync
8 - stevesk@cvs.openbsd.org 2001/05/05 13:42:52 9 - stevesk@cvs.openbsd.org 2001/05/05 13:42:52
9 [sftp.1 ssh-add.1 ssh-keygen.1] 10 [sftp.1 ssh-add.1 ssh-keygen.1]
@@ -5353,4 +5354,4 @@
5353 - Wrote replacements for strlcpy and mkdtemp 5354 - Wrote replacements for strlcpy and mkdtemp
5354 - Released 1.0pre1 5355 - Released 1.0pre1
5355 5356
5356$Id: ChangeLog,v 1.1203 2001/05/06 03:01:02 mouring Exp $ 5357$Id: ChangeLog,v 1.1204 2001/05/06 18:01:43 mouring Exp $
diff --git a/cli.c b/cli.c
index d0f0cf3ff..4adde4bea 100644
--- a/cli.c
+++ b/cli.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cli.c,v 1.11 2001/03/06 00:33:04 deraadt Exp $ */ 1/* $OpenBSD: cli.c,v 1.12 2001/05/06 17:52:07 mouring Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: cli.c,v 1.11 2001/03/06 00:33:04 deraadt Exp $"); 28RCSID("$OpenBSD: cli.c,v 1.12 2001/05/06 17:52:07 mouring Exp $");
29 29
30#include "xmalloc.h" 30#include "xmalloc.h"
31#include "log.h" 31#include "log.h"
diff --git a/cli.h b/cli.h
index bf263dbd2..e8f92e900 100644
--- a/cli.h
+++ b/cli.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */ 1/* $OpenBSD: cli.h,v 1.5 2001/05/06 17:52:07 mouring Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -24,7 +24,7 @@
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27/* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */ 27/* $OpenBSD: cli.h,v 1.5 2001/05/06 17:52:07 mouring Exp $ */
28 28
29#ifndef CLI_H 29#ifndef CLI_H
30#define CLI_H 30#define CLI_H
@@ -35,9 +35,8 @@
35 * of response depending on arg. Tries to ensure that no other userland 35 * of response depending on arg. Tries to ensure that no other userland
36 * buffer is storing the response. 36 * buffer is storing the response.
37 */ 37 */
38char* cli_read_passphrase(const char* prompt, int from_stdin, 38char* cli_read_passphrase(const char* prompt, int from_stdin, int echo_enable);
39 int echo_enable); 39char* cli_prompt(char* prompt, int echo_enable);
40char* cli_prompt(char* prompt, int echo_enable); 40void cli_mesg(char* mesg);
41void cli_mesg(char* mesg);
42 41
43#endif /* CLI_H */ 42#endif /* CLI_H */
diff --git a/readpass.c b/readpass.c
index c1b9a7064..d059272e7 100644
--- a/readpass.c
+++ b/readpass.c
@@ -32,7 +32,7 @@
32 */ 32 */
33 33
34#include "includes.h" 34#include "includes.h"
35RCSID("$OpenBSD: readpass.c,v 1.16 2001/05/02 01:25:39 mouring Exp $"); 35RCSID("$OpenBSD: readpass.c,v 1.17 2001/05/06 17:52:07 mouring Exp $");
36 36
37#include "xmalloc.h" 37#include "xmalloc.h"
38#include "cli.h" 38#include "cli.h"
diff --git a/readpass.h b/readpass.h
index 38d11af6b..55ed294da 100644
--- a/readpass.h
+++ b/readpass.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readpass.h,v 1.2 2001/01/29 01:58:17 niklas Exp $ */ 1/* $OpenBSD: readpass.h,v 1.3 2001/05/06 17:52:08 mouring Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>