]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: fix incorrect debug option name introduce in previous
authordjm@openbsd.org <djm@openbsd.org>
Fri, 17 May 2024 01:17:40 +0000 (01:17 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 17 May 2024 04:41:38 +0000 (14:41 +1000)
commit

OpenBSD-Commit-ID: 66d69e22b1c072c694a7267c847f212284614ed3

servconf.c

index 5b38bb0dce80d7b0fdeb35c5378adbc528025f3a..24d547180436ab4da4de2cafbb71b9f9386e7010 100644 (file)
@@ -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));