Source: pve-libspice-server
Priority: extra
Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libjpeg-dev, zlib1g-dev, python-pyparsing, libpixman-1-dev (>= 0.17.7~)
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libjpeg-dev, zlib1g-dev, python-pyparsing, libpixman-1-dev (>= 0.17.7~), libogg-dev, libsasl2-dev
Standards-Version: 3.9.3
Section: libs
-Index: new/server/reds.c
-===================================================================
---- new.orig/server/reds.c 2013-10-22 10:08:45.000000000 +0200
-+++ new/server/reds.c 2013-10-22 12:10:15.000000000 +0200
-@@ -108,6 +108,7 @@
- static int sasl_enabled = 0; // sasl disabled by default
- #if HAVE_SASL
- static char *sasl_appname = NULL; // default to "spice" if NULL
-+static sasl_callback_t *sasl_callbacks = NULL;
- #endif
- static char *spice_name = NULL;
- static bool spice_uuid_is_set = FALSE;
-@@ -2540,7 +2541,7 @@
- NULL, /* User realm */
- localAddr,
- remoteAddr,
-- NULL, /* Callbacks, not needed */
-+ sasl_callbacks,
- SASL_SUCCESS_DATA,
- &sasl->conn);
- free(localAddr);
-@@ -4104,6 +4105,17 @@
- return 0;
- #else
- return -1;
-+#endif
-+}
-+
-+SPICE_GNUC_VISIBLE int spice_server_set_sasl_callbacks(SpiceServer *s, void *saslcb)
-+{
-+ spice_assert(reds == s);
-+#if HAVE_SASL
-+ sasl_callbacks = (sasl_callback_t *)saslcb;
-+ return 0;
-+#else
-+ return -1;
- #endif
- }
-
Index: new/server/spice-server.syms
===================================================================
---- new.orig/server/spice-server.syms 2013-10-17 13:37:05.000000000 +0200
-+++ new/server/spice-server.syms 2013-10-22 12:08:39.000000000 +0200
-@@ -145,3 +145,8 @@
+--- new.orig/server/spice-server.syms
++++ new/server/spice-server.syms
+@@ -148,6 +148,7 @@ global:
+
+ SPICE_SERVER_0.12.5 {
global:
- spice_server_set_agent_file_xfer;
- } SPICE_SERVER_0.12.3;
-+
-+SPICE_SERVER_0.12.5 {
-+global:
+ spice_server_set_sasl_callbacks;
-+} SPICE_SERVER_0.12.4;
+ spice_server_get_best_playback_rate;
+ spice_server_set_playback_rate;
+ spice_server_get_best_record_rate;
Index: new/server/spice.h
===================================================================
---- new.orig/server/spice.h 2013-10-21 07:33:01.000000000 +0200
-+++ new/server/spice.h 2013-10-22 12:03:36.000000000 +0200
-@@ -446,6 +446,7 @@
+--- new.orig/server/spice.h
++++ new/server/spice.h
+@@ -457,6 +457,7 @@ int spice_server_set_exit_on_disconnect(
int spice_server_set_noauth(SpiceServer *s);
int spice_server_set_sasl(SpiceServer *s, int enabled);
int spice_server_set_sasl_appname(SpiceServer *s, const char *appname);
int spice_server_set_ticket(SpiceServer *s, const char *passwd, int lifetime,
int fail_if_connected, int disconnect_if_connected);
int spice_server_set_tls(SpiceServer *s, int port,
+Index: new/server/reds_stream.c
+===================================================================
+--- new.orig/server/reds_stream.c
++++ new/server/reds_stream.c
+@@ -48,6 +48,18 @@ extern SpiceCoreInterface *core;
+ #if HAVE_SASL
+ #include <sasl/sasl.h>
+
++static sasl_callback_t *sasl_callbacks = NULL;
++
++SPICE_GNUC_VISIBLE int spice_server_set_sasl_callbacks(SpiceServer *s, void *saslcb)
++{
++#if HAVE_SASL
++ sasl_callbacks = (sasl_callback_t *)saslcb;
++ return 0;
++#else
++ return -1;
++#endif
++}
++
+ typedef struct RedsSASL {
+ sasl_conn_t *conn;
+
+@@ -966,7 +978,7 @@ bool reds_sasl_start_auth(RedsStream *st
+ NULL, /* User realm */
+ localAddr,
+ remoteAddr,
+- NULL, /* Callbacks, not needed */
++ sasl_callbacks,
+ SASL_SUCCESS_DATA,
+ &sasl->conn);
+ free(localAddr);