new upstream, updates for debian jessie

[pve-libspice-server.git] / debian / patches / allow-to-set-sasl-callbacks.patch

Index: new/server/spice-server.syms
===================================================================
--- 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_sasl_callbacks;
     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
+++ 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_sasl_callbacks(SpiceServer *s, void *saslcb);
 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);