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

2 files changed, 9 insertions, 14 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