- dtucker@cvs.openbsd.org 2006/07/19 13:07:10

     [servconf.c servconf.h session.c sshd.8 sshd_config sshd_config.5]
     Add ForceCommand keyword to sshd_config, equivalent to the "command="
     key option, man page entry and example in sshd_config.
     Feedback & ok djm@, man page corrections & ok jmc@

1 files changed, 7 insertions, 3 deletions

diff --git a/session.c b/session.c
index 5441a4762..e189acdf2 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.209 2006/07/11 20:07:25 stevesk Exp $ */
+/* $OpenBSD: session.c,v 1.210 2006/07/19 13:07:10 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -672,10 +672,14 @@ do_pre_login(Session *s)
 void
 do_exec(Session *s, const char *command)
 {
-        if (forced_command) {
+        if (options.adm_forced_command) {
+                original_command = command;
+                command = options.adm_forced_command;
+                debug("Forced command (config) '%.900s'", command);
+        } else if (forced_command) {
                 original_command = command;
                 command = forced_command;
-                debug("Forced command '%.900s'", command);
+                debug("Forced command (key option) '%.900s'", command);
         }
 
 #ifdef SSH_AUDIT_EVENTS