summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--auth-options.c5
-rw-r--r--auth-options.h4
-rw-r--r--auth2-pubkey.c9
3 files changed, 9 insertions, 9 deletions
diff --git a/auth-options.c b/auth-options.c
index 57b49f7fd..0a191dbba 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.72 2016/11/30 02:57:40 djm Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.73 2017/05/31 10:54:00 markus 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
@@ -119,7 +119,8 @@ match_flag(const char *opt, int allow_negate, char **optsp, const char *msg)
119 * side effect: sets key option flags 119 * side effect: sets key option flags
120 */ 120 */
121int 121int
122auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) 122auth_parse_options(struct passwd *pw, char *opts, const char *file,
123 u_long linenum)
123{ 124{
124 struct ssh *ssh = active_state; /* XXX */ 125 struct ssh *ssh = active_state; /* XXX */
125 const char *cp; 126 const char *cp;
diff --git a/auth-options.h b/auth-options.h
index 52cbb42aa..547f01635 100644
--- a/auth-options.h
+++ b/auth-options.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.h,v 1.22 2016/11/30 02:57:40 djm Exp $ */ 1/* $OpenBSD: auth-options.h,v 1.23 2017/05/31 10:54:00 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -33,7 +33,7 @@ extern int forced_tun_device;
33extern int key_is_cert_authority; 33extern int key_is_cert_authority;
34extern char *authorized_principals; 34extern char *authorized_principals;
35 35
36int auth_parse_options(struct passwd *, char *, char *, u_long); 36int auth_parse_options(struct passwd *, char *, const char *, u_long);
37void auth_clear_options(void); 37void auth_clear_options(void);
38int auth_cert_options(struct sshkey *, struct passwd *, const char **); 38int auth_cert_options(struct sshkey *, struct passwd *, const char **);
39 39
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 271dbaf65..5794f1f4d 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.66 2017/05/31 09:15:42 deraadt Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.67 2017/05/31 10:54:00 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -587,7 +587,7 @@ match_principals_option(const char *principal_list, struct sshkey_cert *cert)
587} 587}
588 588
589static int 589static int
590process_principals(FILE *f, char *file, struct passwd *pw, 590process_principals(FILE *f, const char *file, struct passwd *pw,
591 const struct sshkey_cert *cert) 591 const struct sshkey_cert *cert)
592{ 592{
593 char line[SSH_MAX_PUBKEY_BYTES], *cp, *ep, *line_opts; 593 char line[SSH_MAX_PUBKEY_BYTES], *cp, *ep, *line_opts;
@@ -625,8 +625,7 @@ process_principals(FILE *f, char *file, struct passwd *pw,
625 for (i = 0; i < cert->nprincipals; i++) { 625 for (i = 0; i < cert->nprincipals; i++) {
626 if (strcmp(cp, cert->principals[i]) == 0) { 626 if (strcmp(cp, cert->principals[i]) == 0) {
627 debug3("%s:%lu: matched principal \"%.100s\"", 627 debug3("%s:%lu: matched principal \"%.100s\"",
628 file == NULL ? "(command)" : file, 628 file, linenum, cert->principals[i]);
629 linenum, cert->principals[i]);
630 if (auth_parse_options(pw, line_opts, 629 if (auth_parse_options(pw, line_opts,
631 file, linenum) != 1) 630 file, linenum) != 1)
632 continue; 631 continue;
@@ -757,7 +756,7 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key)
757 uid_swapped = 1; 756 uid_swapped = 1;
758 temporarily_use_uid(pw); 757 temporarily_use_uid(pw);
759 758
760 ok = process_principals(f, NULL, pw, cert); 759 ok = process_principals(f, "(command)", pw, cert);
761 760
762 fclose(f); 761 fclose(f);
763 f = NULL; 762 f = NULL;