[session.c]
     use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
     ok djm@ markus@
This commit is contained in:
Darren Tucker 2009-06-21 17:55:23 +10:00
parent 3b59dfa161
commit ac46a915e8
2 changed files with 6 additions and 2 deletions

View File

@ -36,6 +36,10 @@
[servconf.c] [servconf.c]
Fixed a few the-the misspellings in comments. Skipped a bunch in Fixed a few the-the misspellings in comments. Skipped a bunch in
binutils,gcc and so on. ok jmc@ binutils,gcc and so on. ok jmc@
- stevesk@cvs.openbsd.org 2009/04/17 19:23:06
[session.c]
use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
ok djm@ markus@
20090616 20090616
- (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t

View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.245 2009/01/22 09:46:01 djm Exp $ */ /* $OpenBSD: session.c,v 1.246 2009/04/17 19:23:06 stevesk Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1789,7 +1789,7 @@ do_child(Session *s, const char *command)
int i; int i;
char *p, *args; char *p, *args;
setproctitle("%s@internal-sftp-server", s->pw->pw_name); setproctitle("%s@%s", s->pw->pw_name, INTERNAL_SFTP_NAME);
args = xstrdup(command ? command : "sftp-server"); args = xstrdup(command ? command : "sftp-server");
for (i = 0, (p = strtok(args, " ")); p; (p = strtok(NULL, " "))) for (i = 0, (p = strtok(args, " ")); p; (p = strtok(NULL, " ")))
if (i < ARGV_MAX - 1) if (i < ARGV_MAX - 1)