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

[openssh.git] / session.c

diff --git a/session.c b/session.c
index d0f9072f39fe93a79da7dd650b82fdb54228b79f..551eb37e6bbc3f1a76fbe39629c2cf31346f1b70 100644 (file)
--- 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",