Move ssh_gssapi_support_oids() to correct position in file to avoid diff.

diff --git a/openssh/gss-serv.c b/openssh/gss-serv.c
index a7a1eab20dd2410bc1ba3ec8d5a5858625d65cfc..ca90d3d755160a7adb7321769ed3d248137d004b 100644 (file)
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -103,32 +103,6 @@ ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data) {
        return (res);
 }
 
-/* Unprivileged */
-void
-ssh_gssapi_supported_oids(gss_OID_set *oidset)
-{
-       int i = 0;
-       OM_uint32 min_status;
-       int present;
-       gss_OID_set supported;
-
-       gss_create_empty_oid_set(&min_status, oidset);
-       /* Ask priviledged process what mechanisms it supports. */
-       PRIVSEP(gss_indicate_mechs(&min_status, &supported));
-
-       while (supported_mechs[i]->name != NULL) {
-               if (GSS_ERROR(gss_test_oid_set_member(&min_status,
-                   &supported_mechs[i]->oid, supported, &present)))
-                       present = 0;
-               if (present)
-                       gss_add_oid_set_member(&min_status,
-                           &supported_mechs[i]->oid, oidset);
-               i++;
-       }
-
-       gss_release_oid_set(&min_status, &supported);
-}
-
 /*
  * Acquire credentials for a server running on the current host.
  * Requires that the context structure contains a valid OID
@@ -183,6 +157,33 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
        return (ssh_gssapi_acquire_cred(*ctx));
 }
 
+/* Unprivileged */
+void
+ssh_gssapi_supported_oids(gss_OID_set *oidset)
+{
+       int i = 0;
+       OM_uint32 min_status;
+       int present;
+       gss_OID_set supported;
+
+       gss_create_empty_oid_set(&min_status, oidset);
+       /* Ask priviledged process what mechanisms it supports. */
+       PRIVSEP(gss_indicate_mechs(&min_status, &supported));
+
+       while (supported_mechs[i]->name != NULL) {
+               if (GSS_ERROR(gss_test_oid_set_member(&min_status,
+                   &supported_mechs[i]->oid, supported, &present)))
+                       present = 0;
+               if (present)
+                       gss_add_oid_set_member(&min_status,
+                           &supported_mechs[i]->oid, oidset);
+               i++;
+       }
+
+       gss_release_oid_set(&min_status, &supported);
+}
+
+
 /* Wrapper around accept_sec_context
  * Requires that the context contains:
  *    oid
@@ -426,6 +427,9 @@ ssh_gssapi_userok(char *user)
        return (0);
 }
 
+/* ssh_gssapi_checkmic() moved to gss-genr.c so it can be called by
+   kexgss_client(). */
+
 /* Priviledged */
 int
 ssh_gssapi_localname(char **user)