diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2017-05-31 10:54:00 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-06-01 14:55:23 +1000 |
| commit | 75b8af8de805c0694b37fcf80ce82783b2acc86f (patch) | |
| tree | d93d2b497f3eba328181548e20365f8c649ecfac /auth-options.c | |
| parent | 84008608c9ee944d9f72f5100f31ccff743b10f2 (diff) | |
| download | openssh-git-75b8af8de805c0694b37fcf80ce82783b2acc86f.tar.gz | |
upstream commit
make sure we don't pass a NULL string to vfprintf
(triggered by the principals-command regress test); ok bluhm
Upstream-ID: eb49854f274ab37a0b57056a6af379a0b7111990
Diffstat (limited to 'auth-options.c')
| -rw-r--r-- | auth-options.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/auth-options.c b/auth-options.c index 57b49f7f..0a191dbb 100644 --- a/auth-options.c +++ b/auth-options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.c,v 1.72 2016/11/30 02:57:40 djm Exp $ */ +/* $OpenBSD: auth-options.c,v 1.73 2017/05/31 10:54:00 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * 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) * side effect: sets key option flags */ int -auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) +auth_parse_options(struct passwd *pw, char *opts, const char *file, + u_long linenum) { struct ssh *ssh = active_state; /* XXX */ const char *cp; |