Fix consolekit mismerges in monitor.c and monitor_wrap.c.

1 files changed, 31 insertions, 31 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 8cc76b380..e62650342 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1311,37 +1311,6 @@ OM_uint32
 mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
 {
         Buffer m;
-
-#ifdef USE_CONSOLEKIT
-char *
-mm_consolekit_register(Session *s, const char *display)
-{
-        Buffer m;
-        char *cookie;
-
-        debug3("%s entering", __func__);
-
-        if (s->ttyfd == -1)
-                return NULL;
-        buffer_init(&m);
-        buffer_put_cstring(&m, s->tty);
-        buffer_put_cstring(&m, display != NULL ? display : "");
-        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_CONSOLEKIT_REGISTER, &m);
-        buffer_clear(&m);
-
-        mm_request_receive_expect(pmonitor->m_recvfd,
-            MONITOR_ANS_CONSOLEKIT_REGISTER, &m);
-        cookie = buffer_get_string(&m, NULL);
-        buffer_free(&m);
-
-        /* treat empty cookie as missing cookie */
-        if (strlen(cookie) == 0) {
-                xfree(cookie);
-                cookie = NULL;
-        }
-        return (cookie);
-}
-#endif /* USE_CONSOLEKIT */
         OM_uint32 major;
         u_int len;
 
@@ -1545,3 +1514,34 @@ mm_jpake_check_confirm(const BIGNUM *k,
         return success;
 }
 #endif /* JPAKE */
+
+#ifdef USE_CONSOLEKIT
+char *
+mm_consolekit_register(Session *s, const char *display)
+{
+        Buffer m;
+        char *cookie;
+
+        debug3("%s entering", __func__);
+
+        if (s->ttyfd == -1)
+                return NULL;
+        buffer_init(&m);
+        buffer_put_cstring(&m, s->tty);
+        buffer_put_cstring(&m, display != NULL ? display : "");
+        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_CONSOLEKIT_REGISTER, &m);
+        buffer_clear(&m);
+
+        mm_request_receive_expect(pmonitor->m_recvfd,
+            MONITOR_ANS_CONSOLEKIT_REGISTER, &m);
+        cookie = buffer_get_string(&m, NULL);
+        buffer_free(&m);
+
+        /* treat empty cookie as missing cookie */
+        if (strlen(cookie) == 0) {
+                xfree(cookie);
+                cookie = NULL;
+        }
+        return (cookie);
+}
+#endif /* USE_CONSOLEKIT */