summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-21 13:57:15 +1100
committerDamien Miller <djm@mindrot.org>2013-11-21 13:57:15 +1100
commitfdb2306acdc3eb2bc46b6dfdaaf6005c650af22a (patch)
treee74555afa79597355921b5e6ce9ba4ae901b5253 /clientloop.c
parente00167307e4d3692695441e9bd712f25950cb894 (diff)
- deraadt@cvs.openbsd.org 2013/11/20 20:54:10
[canohost.c clientloop.c match.c readconf.c sftp.c] unsigned casts for ctype macros where neccessary ok guenther millert markus
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c
index 8ad5d06b0..f30c8b6b5 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.255 2013/11/08 00:39:15 djm Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.256 2013/11/20 20:54:10 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -289,7 +289,7 @@ client_x11_display_valid(const char *display)
289 289
290 dlen = strlen(display); 290 dlen = strlen(display);
291 for (i = 0; i < dlen; i++) { 291 for (i = 0; i < dlen; i++) {
292 if (!isalnum(display[i]) && 292 if (!isalnum((u_char)display[i]) &&
293 strchr(SSH_X11_VALID_DISPLAY_CHARS, display[i]) == NULL) { 293 strchr(SSH_X11_VALID_DISPLAY_CHARS, display[i]) == NULL) {
294 debug("Invalid character '%c' in DISPLAY", display[i]); 294 debug("Invalid character '%c' in DISPLAY", display[i]);
295 return 0; 295 return 0;
@@ -884,7 +884,7 @@ process_cmdline(void)
884 cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); 884 cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
885 if (s == NULL) 885 if (s == NULL)
886 goto out; 886 goto out;
887 while (isspace(*s)) 887 while (isspace((u_char)*s))
888 s++; 888 s++;
889 if (*s == '-') 889 if (*s == '-')
890 s++; /* Skip cmdline '-', if any */ 890 s++; /* Skip cmdline '-', if any */
@@ -938,7 +938,7 @@ process_cmdline(void)
938 goto out; 938 goto out;
939 } 939 }
940 940
941 while (isspace(*++s)) 941 while (isspace((u_char)*++s))
942 ; 942 ;
943 943
944 /* XXX update list of forwards in options */ 944 /* XXX update list of forwards in options */