- markus@cvs.openbsd.org 2001/12/01 21:41:48

     [session.c sshd.8]
     don't pass user defined variables to /usr/bin/login

1 files changed, 15 insertions, 12 deletions

diff --git a/session.c b/session.c
index d0f9072f3..551eb37e6 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.108 2001/10/11 13:45:21 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.110 2001/12/01 21:41:48 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1247,18 +1247,21 @@ do_child(Session *s, const char *command)
                 child_set_env(&env, &envsize, "TZ", getenv("TZ"));
 
         /* Set custom environment options from RSA authentication. */
-        while (custom_environment) {
-                struct envstring *ce = custom_environment;
-                char *s = ce->s;
-                int i;
-                for (i = 0; s[i] != '=' && s[i]; i++);
-                if (s[i] == '=') {
-                        s[i] = 0;
-                        child_set_env(&env, &envsize, s, s + i + 1);
+        if (!options.use_login) {
+                while (custom_environment) {
+                        struct envstring *ce = custom_environment;
+                        char *s = ce->s;
+                        int i;
+                        for (i = 0; s[i] != '=' && s[i]; i++)
+                                ;
+                        if (s[i] == '=') {
+                                s[i] = 0;
+                                child_set_env(&env, &envsize, s, s + i + 1);
+                        }
+                        custom_environment = ce->next;
+                        xfree(ce->s);
+                        xfree(ce);
                 }
-                custom_environment = ce->next;
-                xfree(ce->s);
-                xfree(ce);
         }
 
         snprintf(buf, sizeof buf, "%.50s %d %d",