1 diff -urp libvirt-5.3.0.orig/docs/auth.html libvirt-5.3.0/docs/auth.html
2 --- libvirt-5.3.0.orig/docs/auth.html 2019-04-27 12:38:48.466109972 +0200
3 +++ libvirt-5.3.0/docs/auth.html 2019-05-06 14:07:53.494000000 +0200
4 @@ -318,7 +318,7 @@ to turn on SASL auth in these listeners.
6 Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
7 config change is rquired to enable plain password auth. This is done by
8 -editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
9 +editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
10 parameter to <code>scram-sha-1</code>.
13 diff -urp libvirt-5.3.0.orig/docs/auth.html.in libvirt-5.3.0/docs/auth.html.in
14 --- libvirt-5.3.0.orig/docs/auth.html.in 2019-02-26 00:24:58.954183786 +0100
15 +++ libvirt-5.3.0/docs/auth.html.in 2019-05-06 14:07:53.494000000 +0200
16 @@ -277,7 +277,7 @@ to turn on SASL auth in these listeners.
18 Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
19 config change is rquired to enable plain password auth. This is done by
20 -editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
21 +editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
22 parameter to <code>scram-sha-1</code>.
25 diff -urp libvirt-5.3.0.orig/src/Makefile.in libvirt-5.3.0/src/Makefile.in
26 --- libvirt-5.3.0.orig/src/Makefile.in 2019-05-04 19:53:42.037199636 +0200
27 +++ libvirt-5.3.0/src/Makefile.in 2019-05-06 14:07:53.497000000 +0200
28 @@ -6271,7 +6271,7 @@ REMOTE_DRIVER_PROTOCOL = \
30 # This is needed for clients too, so can't wrap in
31 # the WITH_LIBVIRTD conditional
32 -@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl2
33 +@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl
34 THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
35 SECDRIVER_CFLAGS = $(am__append_191) $(am__append_193)
36 SECDRIVER_LIBS = $(am__append_192) $(am__append_194)
37 diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf
38 --- libvirt-5.3.0.orig/src/qemu/qemu.conf 2019-05-04 19:50:45.015543968 +0200
39 +++ libvirt-5.3.0/src/qemu/qemu.conf 2019-05-06 14:07:53.498000000 +0200
41 # Examples include vinagre, virt-viewer and virt-manager
42 # itself. UltraVNC, RealVNC, TightVNC do not support this
44 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
45 +# It is necessary to configure /etc/sasl/qemu.conf to choose
46 # the desired SASL plugin (eg, GSSPI for Kerberos)
51 -# The default SASL configuration file is located in /etc/sasl2/
52 +# The default SASL configuration file is located in /etc/sasl/
53 # When running libvirtd unprivileged, it may be desirable to
54 # override the configs in this location. Set this parameter to
55 # point to the directory, and create a qemu.conf in that location
57 -#vnc_sasl_dir = "/some/directory/sasl2"
58 +#vnc_sasl_dir = "/some/directory/sasl"
61 # QEMU implements an extension for providing audio over a VNC connection,
63 # Enable use of SASL encryption on the SPICE server. This requires
64 # a SPICE client which supports the SASL protocol extension.
66 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
67 +# It is necessary to configure /etc/sasl/qemu.conf to choose
68 # the desired SASL plugin (eg, GSSPI for Kerberos)
72 -# The default SASL configuration file is located in /etc/sasl2/
73 +# The default SASL configuration file is located in /etc/sasl/
74 # When running libvirtd unprivileged, it may be desirable to
75 # override the configs in this location. Set this parameter to
76 # point to the directory, and create a qemu.conf in that location
78 -#spice_sasl_dir = "/some/directory/sasl2"
79 +#spice_sasl_dir = "/some/directory/sasl"
81 # Enable use of TLS encryption on the chardev TCP transports.
83 diff -urp libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.3.0/src/qemu/test_libvirtd_qemu.aug.in
84 --- libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2019-02-26 00:24:59.030183057 +0100
85 +++ libvirt-5.3.0/src/qemu/test_libvirtd_qemu.aug.in 2019-05-06 14:07:53.498000000 +0200
86 @@ -13,7 +13,7 @@ module Test_libvirtd_qemu =
87 { "vnc_tls_x509_verify" = "1" }
88 { "vnc_password" = "XYZ12345" }
90 -{ "vnc_sasl_dir" = "/some/directory/sasl2" }
91 +{ "vnc_sasl_dir" = "/some/directory/sasl" }
92 { "vnc_allow_host_audio" = "0" }
93 { "spice_listen" = "0.0.0.0" }
95 @@ -21,7 +21,7 @@ module Test_libvirtd_qemu =
96 { "spice_auto_unix_socket" = "1" }
97 { "spice_password" = "XYZ12345" }
98 { "spice_sasl" = "1" }
99 -{ "spice_sasl_dir" = "/some/directory/sasl2" }
100 +{ "spice_sasl_dir" = "/some/directory/sasl" }
101 { "chardev_tls" = "1" }
102 { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
103 { "chardev_tls_x509_verify" = "1" }
104 diff -urp libvirt-5.3.0.orig/src/remote/libvirtd.conf libvirt-5.3.0/src/remote/libvirtd.conf
105 --- libvirt-5.3.0.orig/src/remote/libvirtd.conf 2019-04-27 12:31:34.943092025 +0200
106 +++ libvirt-5.3.0/src/remote/libvirtd.conf 2019-05-06 14:07:53.498000000 +0200
108 # the network providing auth (eg, TLS/x509 certificates)
110 # - sasl: use SASL infrastructure. The actual auth scheme is then
111 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
112 +# controlled from /etc/sasl/libvirt.conf. For the TCP
113 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
114 # For non-TCP or TLS sockets, any scheme is allowed.
117 # If you don't enable SASL, then all TCP traffic is cleartext.
118 # Don't do this outside of a dev/test scenario. For real world
119 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
120 -# mechanism in /etc/sasl2/libvirt.conf
121 +# mechanism in /etc/sasl/libvirt.conf
124 # Change the authentication scheme for TLS sockets.
125 diff -urp libvirt-5.3.0.orig/src/remote/Makefile.inc.am libvirt-5.3.0/src/remote/Makefile.inc.am
126 --- libvirt-5.3.0.orig/src/remote/Makefile.inc.am 2019-04-27 12:31:34.942092034 +0200
127 +++ libvirt-5.3.0/src/remote/Makefile.inc.am 2019-05-06 14:07:53.498000000 +0200
128 @@ -244,7 +244,7 @@ endif WITH_LIBVIRTD
129 # This is needed for clients too, so can't wrap in
130 # the WITH_LIBVIRTD conditional
132 -sasldir = $(sysconfdir)/sasl2
133 +sasldir = $(sysconfdir)/sasl
136 $(MKDIR_P) $(DESTDIR)$(sasldir)
137 diff -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
138 --- libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-12 15:48:37.072414510 +0100
139 +++ libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2019-05-06 14:07:53.499000000 +0200
140 @@ -3,7 +3,7 @@ PATH=/bin \
144 -SASL_CONF_PATH=/root/.sasl2 \
145 +SASL_CONF_PATH=/root/.sasl \
146 QEMU_AUDIO_DRV=none \
147 /usr/bin/qemu-system-i686 \
149 diff -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
150 --- libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-12 15:48:37.073414500 +0100
151 +++ libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2019-05-06 14:07:53.499000000 +0200
152 @@ -3,7 +3,7 @@ PATH=/bin \
156 -SASL_CONF_PATH=/root/.sasl2 \
157 +SASL_CONF_PATH=/root/.sasl \
158 QEMU_AUDIO_DRV=none \
159 /usr/bin/qemu-system-i686 \
161 diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
162 --- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-04-27 12:31:35.106090528 +0200
163 +++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-05-06 14:08:46.241000000 +0200
164 @@ -6,7 +6,7 @@ LOGNAME=test \
165 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
166 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
167 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
168 -SASL_CONF_PATH=/root/.sasl2 \
169 +SASL_CONF_PATH=/root/.sasl \
170 QEMU_AUDIO_DRV=spice \
171 /usr/bin/qemu-system-i686 \
173 diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
174 --- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-04-27 12:31:35.108090510 +0200
175 +++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-05-06 14:08:24.446000000 +0200
176 @@ -6,7 +6,7 @@ LOGNAME=test \
177 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
178 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
179 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
180 -SASL_CONF_PATH=/root/.sasl2 \
181 +SASL_CONF_PATH=/root/.sasl \
182 QEMU_AUDIO_DRV=none \
183 /usr/bin/qemu-system-i686 \
185 diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
186 --- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-04-27 12:31:35.109090500 +0200
187 +++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-05-06 14:08:33.926000000 +0200
188 @@ -6,7 +6,7 @@ LOGNAME=test \
189 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
190 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
191 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
192 -SASL_CONF_PATH=/root/.sasl2 \
193 +SASL_CONF_PATH=/root/.sasl \
194 QEMU_AUDIO_DRV=none \
195 /usr/bin/qemu-system-i686 \
197 diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvtest.c libvirt-5.3.0/tests/qemuxml2argvtest.c
198 --- libvirt-5.3.0.orig/tests/qemuxml2argvtest.c 2019-04-27 12:31:35.156090069 +0200
199 +++ libvirt-5.3.0/tests/qemuxml2argvtest.c 2019-05-06 14:07:53.502000000 +0200
200 @@ -1145,7 +1145,7 @@ mymain(void)
202 driver.config->vncSASL = 1;
203 VIR_FREE(driver.config->vncSASLdir);
204 - ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
205 + ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
206 DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
207 driver.config->vncTLS = 1;
208 driver.config->vncTLSx509verify = 1;
209 @@ -1177,7 +1177,7 @@ mymain(void)
210 DO_TEST("graphics-spice-no-args",
211 QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
212 driver.config->spiceSASL = 1;
213 - ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
214 + ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
215 DO_TEST("graphics-spice-sasl",
217 QEMU_CAPS_DEVICE_QXL);
218 diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.3.0/tests/virconfdata/libvirtd.conf
219 --- libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf 2017-10-30 08:32:36.772365929 +0100
220 +++ libvirt-5.3.0/tests/virconfdata/libvirtd.conf 2019-05-06 14:07:53.502000000 +0200
221 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
222 # the network providing auth (eg, TLS/x509 certificates)
224 # - sasl: use SASL infrastructure. The actual auth scheme is then
225 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
226 +# controlled from /etc/sasl/libvirt.conf. For the TCP
227 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
228 # For non-TCP or TLS sockets, any scheme is allowed.
230 @@ -139,7 +139,7 @@ auth_unix_rw = "none"
231 # If you don't enable SASL, then all TCP traffic is cleartext.
232 # Don't do this outside of a dev/test scenario. For real world
233 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
234 -# mechanism in /etc/sasl2/libvirt.conf
235 +# mechanism in /etc/sasl/libvirt.conf
238 # Change the authentication scheme for TLS sockets.
239 diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out libvirt-5.3.0/tests/virconfdata/libvirtd.out
240 --- libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out 2017-10-30 08:32:36.772365929 +0100
241 +++ libvirt-5.3.0/tests/virconfdata/libvirtd.out 2019-05-06 14:07:53.502000000 +0200
242 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
243 # the network providing auth (eg, TLS/x509 certificates)
245 # - sasl: use SASL infrastructure. The actual auth scheme is then
246 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
247 +# controlled from /etc/sasl/libvirt.conf. For the TCP
248 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
249 # For non-TCP or TLS sockets, any scheme is allowed.
251 @@ -116,7 +116,7 @@ auth_unix_rw = "none"
252 # If you don't enable SASL, then all TCP traffic is cleartext.
253 # Don't do this outside of a dev/test scenario. For real world
254 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
255 -# mechanism in /etc/sasl2/libvirt.conf
256 +# mechanism in /etc/sasl/libvirt.conf
258 # Change the authentication scheme for TLS sockets.