diff options
| -rw-r--r-- | usr.bin/ssh/auth2-pubkey.c | 12 | ||||
| -rw-r--r-- | usr.bin/ssh/misc.c | 12 | ||||
| -rw-r--r-- | usr.bin/ssh/misc.h | 3 |
3 files changed, 14 insertions, 13 deletions
diff --git a/usr.bin/ssh/auth2-pubkey.c b/usr.bin/ssh/auth2-pubkey.c index daf4600e57b..88733d1664d 100644 --- a/usr.bin/ssh/auth2-pubkey.c +++ b/usr.bin/ssh/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.91 2019/07/16 13:18:39 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.92 2019/09/03 08:29:58 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -535,16 +535,6 @@ match_principals_command(struct ssh *ssh, struct passwd *user_pw, return found_principal; } -static void -skip_space(char **cpp) -{ - char *cp; - - for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++) - ; - *cpp = cp; -} - /* * Advanced *cpp past the end of key options, defined as the first unquoted * whitespace character. Returns 0 on success or -1 on failure (e.g. diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c index e08f49c9642..6c250054803 100644 --- a/usr.bin/ssh/misc.c +++ b/usr.bin/ssh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.140 2019/08/16 06:13:15 djm Exp $ */ +/* $OpenBSD: misc.c,v 1.141 2019/09/03 08:29:58 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -2041,3 +2041,13 @@ path_absolute(const char *path) { return (*path == '/') ? 1 : 0; } + +void +skip_space(char **cpp) +{ + char *cp; + + for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++) + ; + *cpp = cp; +} diff --git a/usr.bin/ssh/misc.h b/usr.bin/ssh/misc.h index 5428124308f..16fd630f80b 100644 --- a/usr.bin/ssh/misc.h +++ b/usr.bin/ssh/misc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.79 2019/01/23 21:50:56 dtucker Exp $ */ +/* $OpenBSD: misc.h,v 1.80 2019/09/03 08:29:58 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -44,6 +44,7 @@ struct ForwardOptions { /* misc.c */ char *chop(char *); +void skip_space(char **); char *strdelim(char **); char *strdelimw(char **); int set_nonblock(int); |