vishalmishra434 / rpms / openssh

Forked from rpms/openssh a month ago
Clone
Blob Blame History Raw
diff --color -ruNp a/auth2-gss.c b/auth2-gss.c
--- a/auth2-gss.c	2024-08-26 16:41:44.853553353 +0200
+++ b/auth2-gss.c	2024-08-26 16:57:07.478155469 +0200
@@ -51,6 +51,7 @@
 #define SSH_GSSAPI_MAX_MECHS	2048
 
 extern ServerOptions options;
+extern struct authmethod_cfg methodcfg_gsskeyex;
 extern struct authmethod_cfg methodcfg_gssapi;
 
 static int input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh);
@@ -375,12 +376,6 @@ input_gssapi_mic(int type, u_int32_t ple
 	return 0;
 }
 
-struct authmethod_cfg methodcfg_gsskeyex = {
-	"gssapi-keyex",
-	NULL,
-	&options.gss_authentication
-};
-
 Authmethod method_gsskeyex = {
 	&methodcfg_gsskeyex,
 	userauth_gsskeyex,
diff --color -ruNp a/auth2-methods.c b/auth2-methods.c
--- a/auth2-methods.c	2024-08-26 16:41:44.794552226 +0200
+++ b/auth2-methods.c	2024-08-26 16:57:17.047338002 +0200
@@ -50,6 +50,11 @@ struct authmethod_cfg methodcfg_pubkey =
 	&options.pubkey_authentication
 };
 #ifdef GSSAPI
+struct authmethod_cfg methodcfg_gsskeyex = {
+	"gssapi-keyex",
+	NULL,
+	&options.gss_authentication
+};
 struct authmethod_cfg methodcfg_gssapi = {
 	"gssapi-with-mic",
 	NULL,
@@ -76,6 +81,7 @@ static struct authmethod_cfg *authmethod
 	&methodcfg_none,
 	&methodcfg_pubkey,
 #ifdef GSSAPI
+	&methodcfg_gsskeyex,
 	&methodcfg_gssapi,
 #endif
 	&methodcfg_passwd,