From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 17 May 2024 01:17:40 +0000 (+0000)
Subject: upstream: fix incorrect debug option name introduce in previous
X-Git-Tag: V_9_8_P1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92e55890314ce2b0be21a43ebcbc043b4abc232f;p=thirdparty%2Fopenssh-portable.git

upstream: fix incorrect debug option name introduce in previous

commit

OpenBSD-Commit-ID: 66d69e22b1c072c694a7267c847f212284614ed3
---

diff --git a/servconf.c b/servconf.c
index 5b38bb0dc..24d547180 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.406 2024/05/17 00:30:24 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.407 2024/05/17 01:17:40 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -528,7 +528,7 @@ typedef enum {
 	sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
 	sExposeAuthInfo, sRDomain, sPubkeyAuthOptions, sSecurityKeyProvider,
 	sRequiredRSASize, sChannelTimeout, sUnusedConnectionTimeout,
-	sSshdMonitorPath,
+	sSshdSessionPath,
 	sDeprecated, sIgnore, sUnsupported
 } ServerOpCodes;
 
@@ -691,7 +691,7 @@ static struct {
 	{ "requiredrsasize", sRequiredRSASize, SSHCFG_ALL },
 	{ "channeltimeout", sChannelTimeout, SSHCFG_ALL },
 	{ "unusedconnectiontimeout", sUnusedConnectionTimeout, SSHCFG_ALL },
-	{ "sshdmonitorpath", sSshdMonitorPath, SSHCFG_GLOBAL },
+	{ "sshdsessionpath", sSshdSessionPath, SSHCFG_GLOBAL },
 	{ NULL, sBadOption, 0 }
 };
 
@@ -2503,7 +2503,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 		}
 		goto parse_time;
 
-	case sSshdMonitorPath:
+	case sSshdSessionPath:
 		charptr = &options->sshd_session_path;
 		goto parse_filename;
 
@@ -3081,7 +3081,7 @@ dump_config(ServerOptions *o)
 #if defined(__OpenBSD__) || defined(HAVE_SYS_SET_PROCESS_RDOMAIN)
 	dump_cfg_string(sRDomain, o->routing_domain);
 #endif
-	dump_cfg_string(sSshdMonitorPath, o->sshd_session_path);
+	dump_cfg_string(sSshdSessionPath, o->sshd_session_path);
 
 	/* string arguments requiring a lookup */
 	dump_cfg_string(sLogLevel, log_level_name(o->log_level));