vishalmishra434 / rpms / openssh

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