summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-24 11:41:05 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-24 11:41:05 +1100
commit49b7e235455bf20227877624f8c60c34a6e78458 (patch)
tree4230816523d0ab98e0dfd0e67195039bf172b747
parent1b118881b8f71a84458e42de07708c863f70093f (diff)
- sobrado@cvs.openbsd.org 2009/10/17 12:10:39
[sftp-server.c] sort flags.
-rw-r--r--ChangeLog3
-rw-r--r--sftp-server.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 16f45c8ff..67839e275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - djm@cvs.openbsd.org 2009/10/11 23:03:15 3 - djm@cvs.openbsd.org 2009/10/11 23:03:15
4 [hostfile.c] 4 [hostfile.c]
5 mention the host name that we are looking for in check_host_in_hostfile() 5 mention the host name that we are looking for in check_host_in_hostfile()
6 - sobrado@cvs.openbsd.org 2009/10/17 12:10:39
7 [sftp-server.c]
8 sort flags.
6 9
720091011 1020091011
8 - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for 11 - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for
diff --git a/sftp-server.c b/sftp-server.c
index 66c0c1d5f..20a601f99 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.87 2009/08/31 20:56:02 djm Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.88 2009/10/17 12:10:39 sobrado 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 *
@@ -1322,7 +1322,7 @@ sftp_server_usage(void)
1322 extern char *__progname; 1322 extern char *__progname;
1323 1323
1324 fprintf(stderr, 1324 fprintf(stderr,
1325 "usage: %s [-he] [-l log_level] [-f log_facility] [-u umask]\n", 1325 "usage: %s [-eh] [-f log_facility] [-l log_level] [-u umask]\n",
1326 __progname); 1326 __progname);
1327 exit(1); 1327 exit(1);
1328} 1328}