[pve-devel] r5410 - pve-qemu-kvm/pve2/debian/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-01-21 10:37:28 +0100 (Fri, 21 Jan 2011)
New Revision: 5410

Modified:
   pve-qemu-kvm/pve2/debian/patches/pve-auth.patch
Log:
fix auth helper


Modified: pve-qemu-kvm/pve2/debian/patches/pve-auth.patch
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/pve-auth.patch	2011-01-21 09:27:11 UTC (rev 5409)
+++ pve-qemu-kvm/pve2/debian/patches/pve-auth.patch	2011-01-21 09:37:28 UTC (rev 5410)
@@ -1,7 +1,7 @@
-Index: new/ui/vnc.c
+Index: qemu-kvm/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c	2011-01-19 11:52:01.000000000 +0100
-+++ new/ui/vnc.c	2011-01-19 15:13:13.000000000 +0100
+--- qemu-kvm.orig/ui/vnc.c	2011-01-19 15:13:48.000000000 +0100
++++ qemu-kvm/ui/vnc.c	2011-01-21 10:32:40.000000000 +0100
 @@ -31,6 +31,8 @@
  #include "qemu-timer.h"
  #include "acl.h"
@@ -11,7 +11,7 @@
  
  #define VNC_REFRESH_INTERVAL_BASE 30
  #define VNC_REFRESH_INTERVAL_INC  50
-@@ -46,6 +48,73 @@
+@@ -46,6 +48,75 @@
      } \
  }
  
@@ -27,18 +27,18 @@
 +{
 +    sigset_t oldmask, mask;
 +    int pid, status;
-+    char *args[4];
++    char *args[20];
 +    char **parg;
 +    char *env[2];
 +    char **penv;
 +
-+    char vmidstr[32];
++    char authpath[256];
 +    char pwenv[1024];
 +
-+    sprintf(vmidstr, "%d", pve_vmid);
++    sprintf(authpath, "/vms/%d", pve_vmid);
 +    sprintf(pwenv, "PVE_PW_TICKET=%s", passwd);
 +
-+    const char *script ="/usr/bin/pve-authhelper";
++    const char *script = "/usr/sbin/pveum";
 +
 +    sigemptyset(&mask);
 +    sigaddset(&mask, SIGCHLD);
@@ -58,8 +58,10 @@
 +	    }
 +	    parg = args;
 +	    *parg++ = (char *)script;
-+	    *parg++ = (char *)vmidstr;
++	    *parg++ = "auth";
++	    *parg++ = (char *)authpath;
 +	    *parg++ = (char *)username;
++	    *parg++ = "VM.Console";
 +	    *parg = NULL;
 +	    penv = env;
 +	    *penv++ = (char *)pwenv;
@@ -85,7 +87,7 @@
  static VncDisplay *vnc_display; /* needed for info vnc */
  static DisplayChangeListener *dcl;
  
-@@ -2545,7 +2614,7 @@
+@@ -2545,7 +2616,7 @@
  char *vnc_display_local_addr(DisplayState *ds)
  {
      VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
@@ -94,7 +96,7 @@
      return vnc_socket_local_addr("%s:%s", vs->lsock);
  }
  
-@@ -2669,7 +2738,7 @@
+@@ -2669,7 +2740,7 @@
                  vs->subauth = VNC_AUTH_VENCRYPT_X509VNC;
              } else {
                  VNC_DEBUG("Initializing VNC server with TLS password auth\n");
@@ -103,10 +105,10 @@
              }
          } else {
  #endif /* CONFIG_VNC_TLS */
-Index: new/ui/vnc-auth-vencrypt.c
+Index: qemu-kvm/ui/vnc-auth-vencrypt.c
 ===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c	2011-01-19 11:49:17.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c	2011-01-19 15:12:12.000000000 +0100
+--- qemu-kvm.orig/ui/vnc-auth-vencrypt.c	2011-01-17 06:19:06.000000000 +0100
++++ qemu-kvm/ui/vnc-auth-vencrypt.c	2011-01-19 15:13:48.000000000 +0100
 @@ -26,6 +26,96 @@
  
  #include "vnc.h"
@@ -216,10 +218,10 @@
      case VNC_AUTH_VENCRYPT_TLSVNC:
      case VNC_AUTH_VENCRYPT_X509VNC:
         VNC_DEBUG("Start TLS auth VNC\n");
-Index: new/ui/vnc.h
+Index: qemu-kvm/ui/vnc.h
 ===================================================================
---- new.orig/ui/vnc.h	2011-01-19 11:52:01.000000000 +0100
-+++ new/ui/vnc.h	2011-01-19 11:52:01.000000000 +0100
+--- qemu-kvm.orig/ui/vnc.h	2011-01-19 15:13:48.000000000 +0100
++++ qemu-kvm/ui/vnc.h	2011-01-19 15:13:48.000000000 +0100
 @@ -217,6 +217,8 @@
  
      char challenge[VNC_AUTH_CHALLENGE_SIZE];