Attachment 3591 Details for Bug 3236 – Make repeated Subsystem directives non-fatal

[patch] Make repeated Subsystem directives non-fatal

bz3236.diff (text/plain), 1.04 KB, created by Damien Miller on 2022-05-09 09:48:07 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2022-05-09 09:48:07 AEST

Size: 1.04 KB

patch

obsolete

>commit 3875fc0b2ac16958f2d54acbace84649e6dd53b7
>Author: Damien Miller <djm@mindrot.org>
>Date:   Mon May 9 09:47:01 2022 +1000
>
>    make repeated Subsystem directives non-fatal
>
>diff --git a/servconf.c b/servconf.c
>index f681c2f..4f24192 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -1809,13 +1809,17 @@ process_server_config_line_depth(ServerOptions *options, char *line,
> 			fatal("%s line %d: %s missing argument.",
> 			    filename, linenum, keyword);
> 		if (!*activep) {
>-			arg = argv_next(&ac, &av);
>+			argv_consume(&ac);
> 			break;
> 		}
>-		for (i = 0; i < options->num_subsystems; i++)
>-			if (strcmp(arg, options->subsystem_name[i]) == 0)
>-				fatal("%s line %d: Subsystem '%s' "
>+		for (i = 0; i < options->num_subsystems; i++) {
>+			if (strcmp(arg, options->subsystem_name[i]) == 0) {
>+				logit("%s line %d: Subsystem '%s' "
> 				    "already defined.", filename, linenum, arg);
>+				argv_consume(&ac);
>+				break;
>+			}
>+		}
> 		options->subsystem_name[options->num_subsystems] = xstrdup(arg);
> 		arg = argv_next(&ac, &av);
> 		if (!arg || *arg == '\0')

Flags:

djm: ok? (dtucker)

Actions: View | Diff

Attachments on bug 3236: 3591