summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--auth2-pubkey.c12
-rw-r--r--misc.c12
-rw-r--r--misc.h3
3 files changed, 14 insertions, 13 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 32ce19250..65db116ed 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.91 2019/07/16 13:18:39 djm Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.92 2019/09/03 08:29:58 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -538,16 +538,6 @@ match_principals_command(struct ssh *ssh, struct passwd *user_pw,
538 return found_principal; 538 return found_principal;
539} 539}
540 540
541static void
542skip_space(char **cpp)
543{
544 char *cp;
545
546 for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
547 ;
548 *cpp = cp;
549}
550
551/* 541/*
552 * Advanced *cpp past the end of key options, defined as the first unquoted 542 * Advanced *cpp past the end of key options, defined as the first unquoted
553 * whitespace character. Returns 0 on success or -1 on failure (e.g. 543 * whitespace character. Returns 0 on success or -1 on failure (e.g.
diff --git a/misc.c b/misc.c
index c94d2c266..d5e44da77 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.140 2019/08/16 06:13:15 djm Exp $ */ 1/* $OpenBSD: misc.c,v 1.141 2019/09/03 08:29:58 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -2127,3 +2127,13 @@ path_absolute(const char *path)
2127{ 2127{
2128 return (*path == '/') ? 1 : 0; 2128 return (*path == '/') ? 1 : 0;
2129} 2129}
2130
2131void
2132skip_space(char **cpp)
2133{
2134 char *cp;
2135
2136 for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
2137 ;
2138 *cpp = cp;
2139}
diff --git a/misc.h b/misc.h
index 5b4325aba..8deea5ea6 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.79 2019/01/23 21:50:56 dtucker Exp $ */ 1/* $OpenBSD: misc.h,v 1.80 2019/09/03 08:29:58 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -44,6 +44,7 @@ struct ForwardOptions {
44/* misc.c */ 44/* misc.c */
45 45
46char *chop(char *); 46char *chop(char *);
47void skip_space(char **);
47char *strdelim(char **); 48char *strdelim(char **);
48char *strdelimw(char **); 49char *strdelimw(char **);
49int set_nonblock(int); 50int set_nonblock(int);