4 files changed, 68 insertions, 73 deletions

diff --git a/debian/changelog b/debian/changelog
index d0f19f9fe..d498fed04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:6.2p1-2) UNRELEASED; urgency=low
 
   * Fix build failure on Ubuntu:
     - Include openbsd-compat/sys-queue.h from consolekit.c.
+    - Fix consolekit mismerges in monitor.c and monitor_wrap.c.
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 09 May 2013 00:55:50 +0100
 
diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch
index 0d0a3d9d6..abc6839ba 100644
--- a/debian/patches/consolekit.patch
+++ b/debian/patches/consolekit.patch
@@ -553,10 +553,11 @@ Index: b/monitor.c
  
         for (;;)
                 monitor_read(pmonitor, mon_dispatch, NULL);
-@@ -2232,6 +2248,34 @@
-        buffer_put_int(m, major);
-        buffer_put_string(m, hash.value, hash.length);
+@@ -2472,3 +2488,31 @@
+ }
  
+ #endif /* JPAKE */
++
 +#ifdef USE_CONSOLEKIT
 +int
 +mm_answer_consolekit_register(int sock, Buffer *m)
@@ -584,10 +585,6 @@ Index: b/monitor.c
 +       return (0);
 +}
 +#endif /* USE_CONSOLEKIT */
-+
-        mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
- 
-        gss_release_buffer(&minor, &hash);
 Index: b/monitor.h
 ===================================================================
 --- a/monitor.h
@@ -605,10 +602,10 @@ Index: b/monitor_wrap.c
 ===================================================================
 --- a/monitor_wrap.c
 +++ b/monitor_wrap.c
-@@ -1311,6 +1311,37 @@
- mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
- {
-        Buffer m;
+@@ -1514,3 +1514,34 @@
+        return success;
+ }
+ #endif /* JPAKE */
 +
 +#ifdef USE_CONSOLEKIT
 +char *
@@ -640,9 +637,6 @@ Index: b/monitor_wrap.c
 +       return (cookie);
 +}
 +#endif /* USE_CONSOLEKIT */
-        OM_uint32 major;
-        u_int len;
- 
 Index: b/monitor_wrap.h
 ===================================================================
 --- a/monitor_wrap.h
diff --git a/monitor.c b/monitor.c
index 9b08020ca..a9021fc4d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2248,34 +2248,6 @@ mm_answer_gss_sign(int socket, Buffer *m)
         buffer_put_int(m, major);
         buffer_put_string(m, hash.value, hash.length);
 
-#ifdef USE_CONSOLEKIT
-int
-mm_answer_consolekit_register(int sock, Buffer *m)
-{
-        Session *s;
-        char *tty, *display;
-        char *cookie = NULL;
-
-        debug3("%s entering", __func__);
-
-        tty = buffer_get_string(m, NULL);
-        display = buffer_get_string(m, NULL);
-        s = session_by_tty(tty);
-        if (s != NULL)
-                cookie = consolekit_register(s, display);
-        buffer_clear(m);
-        buffer_put_cstring(m, cookie != NULL ? cookie : "");
-        mm_request_send(sock, MONITOR_ANS_CONSOLEKIT_REGISTER, m);
-
-        if (cookie != NULL)
-                xfree(cookie);
-        xfree(display);
-        xfree(tty);
-
-        return (0);
-}
-#endif /* USE_CONSOLEKIT */
-
         mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
 
         gss_release_buffer(&minor, &hash);
@@ -2516,3 +2488,31 @@ mm_answer_jpake_check_confirm(int sock, Buffer *m)
 }
 
 #endif /* JPAKE */
+
+#ifdef USE_CONSOLEKIT
+int
+mm_answer_consolekit_register(int sock, Buffer *m)
+{
+        Session *s;
+        char *tty, *display;
+        char *cookie = NULL;
+
+        debug3("%s entering", __func__);
+
+        tty = buffer_get_string(m, NULL);
+        display = buffer_get_string(m, NULL);
+        s = session_by_tty(tty);
+        if (s != NULL)
+                cookie = consolekit_register(s, display);
+        buffer_clear(m);
+        buffer_put_cstring(m, cookie != NULL ? cookie : "");
+        mm_request_send(sock, MONITOR_ANS_CONSOLEKIT_REGISTER, m);
+
+        if (cookie != NULL)
+                xfree(cookie);
+        xfree(display);
+        xfree(tty);
+
+        return (0);
+}
+#endif /* USE_CONSOLEKIT */
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 */