summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authordjm <djm>2013-10-23 05:29:40 +0000
committerdjm <djm>2013-10-23 05:29:40 +0000
commit69b0ec77e73a9e3875dac68b240fab7021452f41 (patch)
treeda2caace6e5d132a4256ce47ab3652182079d3ad /readconf.c
parentfe756c9503985557471b074bea303e960d821109 (diff)
downloadopenssh-69b0ec77e73a9e3875dac68b240fab7021452f41.tar.gz
- djm@cvs.openbsd.org 2013/10/20 06:19:28
[readconf.c ssh_config.5] rename "command" subclause of the recently-added "Match" keyword to "exec"; it's shorter, clearer in intent and we might want to add the ability to match against the command being executed at the remote end in the future.
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/readconf.c b/readconf.c
index fb77fa9d..bd13d417 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.209 2013/10/16 22:49:38 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.210 2013/10/20 06:19:27 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -504,7 +504,7 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
debug("%.200s line %d: matched "
"'LocalUser %.100s' ",
filename, linenum, pw->pw_name);
- } else if (strcasecmp(attrib, "command") == 0) {
+ } else if (strcasecmp(attrib, "exec") == 0) {
if (gethostname(thishost, sizeof(thishost)) == -1)
fatal("gethostname: %s", strerror(errno));
strlcpy(shorthost, thishost, sizeof(shorthost));
@@ -523,11 +523,11 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
(char *)NULL);
r = execute_in_shell(cmd);
if (r == -1) {
- fatal("%.200s line %d: match command '%.100s' "
+ fatal("%.200s line %d: match exec '%.100s' "
"error", filename, linenum, cmd);
} else if (r == 0) {
debug("%.200s line %d: matched "
- "'Command \"%.100s\"' ",
+ "'exec \"%.100s\"' ",
filename, linenum, cmd);
} else
result = 0;