Attachment 3386 Details for Bug 3126 – fatal out if config has unsupported rdomain keyword

[patch] fatal out if config has unsupported rdomain keyword

sshd-rdomain.patch (text/plain), 1.17 KB, created by Darren Tucker on 2020-04-24 14:34:26 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2020-04-24 14:34:26 AEST

Size: 1.17 KB

patch

obsolete

>diff --git a/servconf.c b/servconf.c
>index ce5572db..093bb520 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -2332,6 +2332,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
> 		goto parse_flag;
> 
> 	case sRDomain:
>+#if defined(__OpenBSD__) || defined(HAVE_SYS_SET_PROCESS_RDOMAIN)
> 		charptr = &options->routing_domain;
> 		arg = strdelim(&cp);
> 		if (!arg || *arg == '\0')
>@@ -2344,6 +2345,10 @@ process_server_config_line_depth(ServerOptions *options, char *line,
> 		if (*activep && *charptr == NULL)
> 			*charptr = xstrdup(arg);
> 		break;
>+#else
>+		fatal("%s line %d: setting RDomain not supported on this "
>+		    "platform.", filename, linenum);
>+#endif
> 
> 	case sDeprecated:
> 	case sIgnore:
>@@ -2840,7 +2845,9 @@ dump_config(ServerOptions *o)
> 	dump_cfg_string(sHostbasedAcceptedKeyTypes, o->hostbased_key_types);
> 	dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms);
> 	dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types);
>+#if defined(__OpenBSD__) || defined(HAVE_SYS_SET_PROCESS_RDOMAIN)
> 	dump_cfg_string(sRDomain, o->routing_domain);
>+#endif
> 
> 	/* string arguments requiring a lookup */
> 	dump_cfg_string(sLogLevel, log_level_name(o->log_level));

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 3126: 3358 | 3370 | 3386