1 files changed, 15 insertions, 10 deletions

diff --git a/auth-options.c b/auth-options.c
index 3fa236eb8..9ab1880d9 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.65 2015/01/14 10:30:34 markus Exp $ */
+/* $OpenBSD: auth-options.c,v 1.67 2015/05/01 03:20:54 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -220,8 +220,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                         goto next_option;
                 }
                 cp = "environment=\"";
-                if (options.permit_user_env &&
-                    strncasecmp(opts, cp, strlen(cp)) == 0) {
+                if (strncasecmp(opts, cp, strlen(cp)) == 0) {
                         char *s;
                         struct envstring *new_envstring;
 
@@ -247,13 +246,19 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 goto bad_option;
                         }
                         s[i] = '\0';
-                        auth_debug_add("Adding to environment: %.900s", s);
-                        debug("Adding to environment: %.900s", s);
                         opts++;
-                        new_envstring = xcalloc(1, sizeof(struct envstring));
-                        new_envstring->s = s;
-                        new_envstring->next = custom_environment;
-                        custom_environment = new_envstring;
+                        if (options.permit_user_env) {
+                                auth_debug_add("Adding to environment: "
+                                    "%.900s", s);
+                                debug("Adding to environment: %.900s", s);
+                                new_envstring = xcalloc(1,
+                                    sizeof(*new_envstring));
+                                new_envstring->s = s;
+                                new_envstring->next = custom_environment;
+                                custom_environment = new_envstring;
+                                s = NULL;
+                        }
+                        free(s);
                         goto next_option;
                 }
                 cp = "from=\"";
@@ -620,7 +625,7 @@ auth_cert_options(struct sshkey *k, struct passwd *pw)
                     &cert_source_address_done) == -1)
                         return -1;
                 if (parse_option_list(k->cert->extensions, pw,
-                    OPTIONS_EXTENSIONS, 1,
+                    OPTIONS_EXTENSIONS, 0,
                     &cert_no_port_forwarding_flag,
                     &cert_no_agent_forwarding_flag,
                     &cert_no_x11_forwarding_flag,