summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-15 11:56:25 +1100
committerDamien Miller <djm@mindrot.org>2013-10-15 11:56:25 +1100
commit73600e51af9ee734a19767e0c084bbbc5eb5b8da (patch)
tree93afef1c2ffc394ffd2b71bd0f86ac7b4328ca49
parent6eaeebf27d92f39a38c772aa3f20c2250af2dd29 (diff)
- djm@cvs.openbsd.org 2013/10/10 00:53:25
[sftp-server.c] add -Q, -P and -p to usage() before jmc@ catches me
-rw-r--r--ChangeLog3
-rw-r--r--sftp-server.c5
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 @@
6 Refactor dispatch loop and consolidate read-only mode checks. 6 Refactor dispatch loop and consolidate read-only mode checks.
7 Make global variables static, since sftp-server is linked into sshd(8). 7 Make global variables static, since sftp-server is linked into sshd(8).
8 ok dtucker@ 8 ok dtucker@
9 - djm@cvs.openbsd.org 2013/10/10 00:53:25
10 [sftp-server.c]
11 add -Q, -P and -p to usage() before jmc@ catches me
9 12
1020131010 1320131010
11 - (dtucker) OpenBSD CVS Sync 14 - (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 @@
1/* $OpenBSD: sftp-server.c,v 1.98 2013/10/09 23:42:17 djm Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.99 2013/10/10 00:53:25 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
4 * 4 *
@@ -1392,7 +1392,8 @@ sftp_server_usage(void)
1392 1392
1393 fprintf(stderr, 1393 fprintf(stderr,
1394 "usage: %s [-ehR] [-d start_directory] [-f log_facility] " 1394 "usage: %s [-ehR] [-d start_directory] [-f log_facility] "
1395 "[-l log_level]\n\t[-u umask]\n", 1395 "[-l log_level]\n\t[-p request_whitelist] [-P request_blacklist] "
1396 "[-Q feature] [-u umask]\n",
1396 __progname); 1397 __progname);
1397 exit(1); 1398 exit(1);
1398} 1399}