- (djm) Avoid warning in PAM code by making read_passphrase arguments const
diff --git a/ChangeLog b/ChangeLog
index 18cc5eb..4901453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
- (djm) Avoid a warning in bsd-bindresvport.c
- (djm) Try to avoid adding -I/usr/include to CPPFLAGS during SSL tests. This
can cause weird segfaults errors on Solaris
+ - (djm) Avoid warning in PAM code by making read_passphrase arguments const
20010115
- (bal) sftp-server.c change to use chmod() if fchmod() does not exist.
diff --git a/cli.c b/cli.c
index f5c6728..931107f 100644
--- a/cli.c
+++ b/cli.c
@@ -129,7 +129,7 @@
}
static int
-cli_write(char* buf, int size)
+cli_write(const char* buf, int size)
{
int i, len, pos, ret = 0;
char *output, *p;
@@ -161,7 +161,7 @@
* buffer is storing the response.
*/
char*
-cli_read_passphrase(char* prompt, int from_stdin, int echo_enable)
+cli_read_passphrase(const char* prompt, int from_stdin, int echo_enable)
{
char buf[BUFSIZ];
char* p;
diff --git a/cli.h b/cli.h
index c419404..fbcc879 100644
--- a/cli.h
+++ b/cli.h
@@ -9,7 +9,8 @@
* of response depending on arg. Tries to ensure that no other userland
* buffer is storing the response.
*/
-char* cli_read_passphrase(char* prompt, int from_stdin, int echo_enable);
+char* cli_read_passphrase(const char* prompt, int from_stdin,
+ int echo_enable);
char* cli_prompt(char* prompt, int echo_enable);
void cli_mesg(char* mesg);
diff --git a/readpass.c b/readpass.c
index f3a7dcb..64281ed 100644
--- a/readpass.c
+++ b/readpass.c
@@ -49,7 +49,7 @@
* compatibility with existing code.
*/
char *
-read_passphrase(char *prompt, int from_stdin)
+read_passphrase(const char *prompt, int from_stdin)
{
return cli_read_passphrase(prompt, from_stdin, 0);
}
diff --git a/ssh.h b/ssh.h
index 27575c2..f7330b9 100644
--- a/ssh.h
+++ b/ssh.h
@@ -418,7 +418,7 @@
* passphrase (allocated with xmalloc). Exits if EOF is encountered. If
* from_stdin is true, the passphrase will be read from stdin instead.
*/
-char *read_passphrase(char *prompt, int from_stdin);
+char *read_passphrase(const char *prompt, int from_stdin);
/*------------ Definitions for logging. -----------------------*/