summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-01-06 22:44:18 +1100
committerDamien Miller <djm@mindrot.org>2011-01-06 22:44:18 +1100
commitde53fd04b1e58059673c4d827f7cc4752870174f (patch)
tree62fcd4b55687a6b43f8e4f63104ad2cdf4d532b4
parent106079c06d308f6fb3b582607f590b2dcb4682b0 (diff)
- djm@cvs.openbsd.org 2010/12/24 21:41:48
[auth-options.c] don't send the actual forced command in a debug message; ok markus deraadt
-rw-r--r--ChangeLog3
-rw-r--r--auth-options.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3be37d2c7..0cdc191b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 reset SIGCHLD handler before fork (and restore it after) so we don't miss 19 reset SIGCHLD handler before fork (and restore it after) so we don't miss
20 the the askpass child's exit status. Correct test for exit status/signal to 20 the the askpass child's exit status. Correct test for exit status/signal to
21 account for waitpid() failure; with claudio@ ok claudio@ markus@ 21 account for waitpid() failure; with claudio@ ok claudio@ markus@
22 - djm@cvs.openbsd.org 2010/12/24 21:41:48
23 [auth-options.c]
24 don't send the actual forced command in a debug message; ok markus deraadt
22 25
2320110104 2620110104
24 - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage 27 - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage
diff --git a/auth-options.c b/auth-options.c
index a9c26add6..eae45cf2b 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.53 2010/08/31 09:58:37 djm Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.54 2010/12/24 21:41:48 djm 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
@@ -172,7 +172,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
172 goto bad_option; 172 goto bad_option;
173 } 173 }
174 forced_command[i] = '\0'; 174 forced_command[i] = '\0';
175 auth_debug_add("Forced command: %.900s", forced_command); 175 auth_debug_add("Forced command.");
176 opts++; 176 opts++;
177 goto next_option; 177 goto next_option;
178 } 178 }