]>
Commit | Line | Data |
---|---|---|
fb4a48f2 DM |
1 | Index: new/server/spice-server.syms |
2 | =================================================================== | |
86cdaac6 DM |
3 | --- new.orig/server/spice-server.syms |
4 | +++ new/server/spice-server.syms | |
5 | @@ -148,6 +148,7 @@ global: | |
6 | ||
7 | SPICE_SERVER_0.12.5 { | |
fb4a48f2 | 8 | global: |
fb4a48f2 | 9 | + spice_server_set_sasl_callbacks; |
86cdaac6 DM |
10 | spice_server_get_best_playback_rate; |
11 | spice_server_set_playback_rate; | |
12 | spice_server_get_best_record_rate; | |
4df07ad3 | 13 | Index: new/server/spice-server.h |
fb4a48f2 | 14 | =================================================================== |
4df07ad3 DM |
15 | --- new.orig/server/spice-server.h |
16 | +++ new/server/spice-server.h | |
17 | @@ -53,6 +53,7 @@ int spice_server_set_exit_on_disconnect( | |
fb4a48f2 DM |
18 | int spice_server_set_noauth(SpiceServer *s); |
19 | int spice_server_set_sasl(SpiceServer *s, int enabled); | |
20 | int spice_server_set_sasl_appname(SpiceServer *s, const char *appname); | |
21 | +int spice_server_set_sasl_callbacks(SpiceServer *s, void *saslcb); | |
22 | int spice_server_set_ticket(SpiceServer *s, const char *passwd, int lifetime, | |
23 | int fail_if_connected, int disconnect_if_connected); | |
24 | int spice_server_set_tls(SpiceServer *s, int port, | |
1636a5de | 25 | Index: new/server/red-stream.c |
86cdaac6 | 26 | =================================================================== |
1636a5de DC |
27 | --- new.orig/server/red-stream.c |
28 | +++ new/server/red-stream.c | |
86cdaac6 DM |
29 | @@ -48,6 +48,18 @@ extern SpiceCoreInterface *core; |
30 | #if HAVE_SASL | |
31 | #include <sasl/sasl.h> | |
32 | ||
33 | +static sasl_callback_t *sasl_callbacks = NULL; | |
34 | + | |
35 | +SPICE_GNUC_VISIBLE int spice_server_set_sasl_callbacks(SpiceServer *s, void *saslcb) | |
36 | +{ | |
37 | +#if HAVE_SASL | |
38 | + sasl_callbacks = (sasl_callback_t *)saslcb; | |
39 | + return 0; | |
40 | +#else | |
41 | + return -1; | |
42 | +#endif | |
43 | +} | |
44 | + | |
1636a5de | 45 | typedef struct RedSASL { |
86cdaac6 DM |
46 | sasl_conn_t *conn; |
47 | ||
1636a5de | 48 | @@ -976,7 +988,7 @@ bool red_sasl_start_auth(RedsStream *st |
86cdaac6 DM |
49 | NULL, /* User realm */ |
50 | localAddr, | |
51 | remoteAddr, | |
52 | - NULL, /* Callbacks, not needed */ | |
53 | + sasl_callbacks, | |
54 | SASL_SUCCESS_DATA, | |
55 | &sasl->conn); | |
56 | free(localAddr); |