diff options
author | Damien Miller <djm@mindrot.org> | 2001-01-17 11:10:48 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-01-17 11:10:48 +1100 |
commit | 92e78f8c6424f0d466e1df673228870ef009105b (patch) | |
tree | 1809206c2385b1a49b459a80dba363a352effaa2 | |
parent | a64b57a157068c793ac7be2ad276b208a7d10a90 (diff) | |
download | openssh-git-92e78f8c6424f0d466e1df673228870ef009105b.tar.gz |
- (djm) Avoid warning in PAM code by making read_passphrase arguments const
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | cli.c | 4 | ||||
-rw-r--r-- | cli.h | 3 | ||||
-rw-r--r-- | readpass.c | 2 | ||||
-rw-r--r-- | ssh.h | 2 |
5 files changed, 7 insertions, 5 deletions
@@ -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. @@ -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; @@ -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); @@ -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); } @@ -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. -----------------------*/ |