Attachment 2592 Details for Bug 2329 – revised diff

[patch] revised diff

auth_options_permit_env.diff (text/plain), 1.26 KB, created by Damien Miller on 2015-04-17 15:42:53 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2015-04-17 15:42:53 AEST

Size: 1.26 KB

patch

obsolete

>diff --git a/auth-options.c b/auth-options.c
>index b25a227..3ad26a6 100644
>--- a/auth-options.c
>+++ b/auth-options.c
>@@ -206,8 +206,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;
> 
>@@ -233,13 +232,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=\"";

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2329: 2520 | 2592