- (djm) Avoid warning in PAM code by making read_passphrase arguments const

diff --git a/ChangeLog b/ChangeLog
index 18cc5ebfbb6bb3271b0d2ce3a44e5f110758f440..49014534eb28d121528667d0ccd007d96ce36b5e 100644 (file)
--- 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 f5c6728cb73d004e670c67ea3ad65297bac48402..931107f2828c5e5426da22a302ef4a3c9ed8b837 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -129,7 +129,7 @@ cli_read(char* buf, int size, int echo)
 }
 
 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 @@ cli_write(char* buf, int size)
  * 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 c4194046a26c3dad29c987ef6a31718578abd263..fbcc87968af9869fa77b85085ed636f131f416b9 100644 (file)
--- 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 f3a7dcbed274da056fcb0810973218949a7bc969..64281edd6fd9f3431cb909efe400d24b13298e6c 100644 (file)
--- a/readpass.c
+++ b/readpass.c
@@ -49,7 +49,7 @@ RCSID("$OpenBSD: readpass.c,v 1.12 2000/10/11 20:14:39 markus Exp $");
  * 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 27575c2987f62ad6408f3e8de82580284b5313ef..f7330b915bd2249c88a22eb58eccde367014668f 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -418,7 +418,7 @@ int     auth_rsa_challenge_dialog(RSA *pk);
  * 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. -----------------------*/