2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c799fbaf..4d6051053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,10 @@
      [servconf.c]
      Fixed a few the-the misspellings in comments. Skipped a bunch in
      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
  - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
diff --git a/session.c b/session.c
index 8e0c54faa..f04266f78 100644
--- a/session.c
+++ b/session.c
@@ -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
  *                    All rights reserved
@@ -1789,7 +1789,7 @@ do_child(Session *s, const char *command)
                 int i;
                 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");
                 for (i = 0, (p = strtok(args, " ")); p; (p = strtok(NULL, " ")))
                         if (i < ARGV_MAX - 1)