Attachment 2614 Details for Bug 2272 – more activep checks

[patch] more activep checks

activep.diff (text/plain), 2.00 KB, created by Damien Miller on 2015-05-01 15:15:10 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2015-05-01 15:15:10 AEST

Size: 2.00 KB

patch

obsolete

>diff --git a/servconf.c b/servconf.c
>index ad7e7a3..1a74856 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -978,7 +978,7 @@ process_server_config_line(ServerOptions *options, char *line,
> 		if ((value = convtime(arg)) == -1)
> 			fatal("%s line %d: invalid time value.",
> 			    filename, linenum);
>-		if (*intptr == -1)
>+		if (*activep && *intptr == -1)
> 			*intptr = value;
> 		break;
> 
>@@ -1559,7 +1559,7 @@ process_server_config_line(ServerOptions *options, char *line,
> 		if (value == -1)
> 			fatal("%s line %d: Bad yes/point-to-point/ethernet/"
> 			    "no argument: %s", filename, linenum, arg);
>-		if (*intptr == -1)
>+		if (*activep && *intptr == -1)
> 			*intptr = value;
> 		break;
> 
>@@ -1698,7 +1698,7 @@ process_server_config_line(ServerOptions *options, char *line,
> 		break;
> 
> 	case sAuthenticationMethods:
>-		if (*activep && options->num_auth_methods == 0) {
>+		if (options->num_auth_methods == 0) {
> 			while ((arg = strdelim(&cp)) && *arg != '\0') {
> 				if (options->num_auth_methods >=
> 				    MAX_AUTH_METHODS)
>@@ -1709,6 +1709,8 @@ process_server_config_line(ServerOptions *options, char *line,
> 					fatal("%s line %d: invalid "
> 					    "authentication method list.",
> 					    filename, linenum);
>+				if (!*activep)
>+					continue;
> 				options->auth_methods[
> 				    options->num_auth_methods++] = xstrdup(arg);
> 			}
>@@ -1718,13 +1720,14 @@ process_server_config_line(ServerOptions *options, char *line,
> 	case sStreamLocalBindMask:
> 		arg = strdelim(&cp);
> 		if (!arg || *arg == '\0')
>-			fatal("%s line %d: missing StreamLocalBindMask argument.",
>-			    filename, linenum);
>+			fatal("%s line %d: missing StreamLocalBindMask "
>+			    "argument.", filename, linenum);
> 		/* Parse mode in octal format */
> 		value = strtol(arg, &p, 8);
> 		if (arg == p || value < 0 || value > 0777)
> 			fatal("%s line %d: Bad mask.", filename, linenum);
>-		options->fwd_opts.streamlocal_bind_mask = (mode_t)value;
>+		if (*activep)
>+			options->fwd_opts.streamlocal_bind_mask = (mode_t)value;
> 		break;
> 
> 	case sStreamLocalBindUnlink:

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2272: 2480 | 2614