From 73600e51af9ee734a19767e0c084bbbc5eb5b8da Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 15 Oct 2013 11:56:25 +1100 Subject: - djm@cvs.openbsd.org 2013/10/10 00:53:25 [sftp-server.c] add -Q, -P and -p to usage() before jmc@ catches me --- ChangeLog | 3 +++ sftp-server.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ab5a2cbf..b67c1bc2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ Refactor dispatch loop and consolidate read-only mode checks. Make global variables static, since sftp-server is linked into sshd(8). ok dtucker@ + - djm@cvs.openbsd.org 2013/10/10 00:53:25 + [sftp-server.c] + add -Q, -P and -p to usage() before jmc@ catches me 20131010 - (dtucker) OpenBSD CVS Sync diff --git a/sftp-server.c b/sftp-server.c index ca8335ec7..52278148d 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.98 2013/10/09 23:42:17 djm Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.99 2013/10/10 00:53:25 djm Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -1392,7 +1392,8 @@ sftp_server_usage(void) fprintf(stderr, "usage: %s [-ehR] [-d start_directory] [-f log_facility] " - "[-l log_level]\n\t[-u umask]\n", + "[-l log_level]\n\t[-p request_whitelist] [-P request_blacklist] " + "[-Q feature] [-u umask]\n", __progname); exit(1); } -- cgit v1.2.3