tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2013/01/04 19:26:38

Browse Source 
[sftp-server.8 sftp-server.c]
     sftp-server.8: add argument name to -d
     sftp-server.c: add -d to usage()
     ok djm
This commit is contained in:
Damien Miller 2013-01-09 15:58:21 +11:00
parent ec77c954c8
commit aa7ad3039c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -27,6 +27,11 @@
[ssh-keygen.c] [ssh-keygen.c]
allow fingerprinting of keys hosted in PKCS#11 tokens: ssh-keygen -lD ... allow fingerprinting of keys hosted in PKCS#11 tokens: ssh-keygen -lD ...
ok markus@ ok markus@
- jmc@cvs.openbsd.org 2013/01/04 19:26:38
[sftp-server.8 sftp-server.c]
sftp-server.8: add argument name to -d
sftp-server.c: add -d to usage()
ok djm
20121217 20121217
- (dtucker) [Makefile.in] Add some scaffolding so that the new regress - (dtucker) [Makefile.in] Add some scaffolding so that the new regress

6
sftp-server.8
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: sftp-server.8,v 1.20 2013/01/03 12:54:49 djm Exp $ .\" $OpenBSD: sftp-server.8,v 1.21 2013/01/04 19:26:38 jmc Exp $
.\" .\"
.\" Copyright (c) 2000 Markus Friedl. All rights reserved. .\" Copyright (c) 2000 Markus Friedl. All rights reserved.
.\" .\"
@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.Dd $Mdocdate: January 3 2013 $ .Dd $Mdocdate: January 4 2013 $
.Dt SFTP-SERVER 8 .Dt SFTP-SERVER 8
.Os .Os
.Sh NAME .Sh NAME
@ -57,7 +57,7 @@ for more information.
.Pp .Pp
Valid options are: Valid options are:
.Bl -tag -width Ds .Bl -tag -width Ds
.It Fl d .It Fl d Ar start_directory
specifies an alternate starting directory for users. specifies an alternate starting directory for users.
The pathname may contain the following tokens that are expanded at runtime: The pathname may contain the following tokens that are expanded at runtime:
%% is replaced by a literal '%', %% is replaced by a literal '%',

5
sftp-server.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-server.c,v 1.95 2013/01/03 12:54:49 djm Exp $ */ /* $OpenBSD: sftp-server.c,v 1.96 2013/01/04 19:26:38 jmc Exp $ */
/* /*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
* *
@ -1390,7 +1390,8 @@ sftp_server_usage(void)
extern char *__progname; extern char *__progname;
fprintf(stderr, fprintf(stderr,
"usage: %s [-ehR] [-f log_facility] [-l log_level] [-u umask]\n", "usage: %s [-ehR] [-d start_directory] [-f log_facility] "
"[-l log_level]\n\t[-u umask]\n",
__progname); __progname);
exit(1); exit(1);
} }