- dtucker@cvs.openbsd.org 2009/11/20 00:15:41

     [session.c]
     Warn but do not fail if stat()ing the subsystem binary fails.  This helps
     with chrootdirectory+forcecommand=sftp-server and restricted shells.
     bz #1599, ok djm.

2 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ece9c09d..16b9c133a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,11 @@
      with ForceCommand=internal-sftp with a shell session (i.e. not a
      subsystem session). Avoids stuck client when attempting to ssh to such a
      service. ok dtucker@
+   - dtucker@cvs.openbsd.org 2009/11/20 00:15:41
+     [session.c]
+     Warn but do not fail if stat()ing the subsystem binary fails.  This helps
+     with chrootdirectory+forcecommand=sftp-server and restricted shells.
+     bz #1599, ok djm.
 
 20091226
  - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/session.c b/session.c
index cc205386f..733b5a909 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.248 2009/11/19 23:39:50 djm Exp $ */
+/* $OpenBSD: session.c,v 1.249 2009/11/20 00:15:41 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2121,16 +2121,16 @@ session_subsystem_req(Session *s)
                 if (strcmp(subsys, options.subsystem_name[i]) == 0) {
                         prog = options.subsystem_command[i];
                         cmd = options.subsystem_args[i];
-                        if (!strcmp(INTERNAL_SFTP_NAME, prog)) {
+                        if (strcmp(INTERNAL_SFTP_NAME, prog) == 0) {
                                 s->is_subsystem = SUBSYSTEM_INT_SFTP;
-                        } else if (stat(prog, &st) < 0) {
-                                error("subsystem: cannot stat %s: %s", prog,
-                                    strerror(errno));
-                                break;
+                                debug("subsystem: %s", prog);
                         } else {
+                                if (stat(prog, &st) < 0)
+                                        debug("subsystem: cannot stat %s: %s",
+                                            prog, strerror(errno));
                                 s->is_subsystem = SUBSYSTEM_EXT;
+                                debug("subsystem: exec() %s", cmd);
                         }
-                        debug("subsystem: exec() %s", cmd);
                         success = do_exec(s, cmd) == 0;
                         break;
                 }