1 diff -urp libvirt-4.1.0.orig/docs/auth.html libvirt-4.1.0/docs/auth.html
2 --- libvirt-4.1.0.orig/docs/auth.html 2018-02-26 09:05:10.000000000 +0000
3 +++ libvirt-4.1.0/docs/auth.html 2018-03-12 10:51:10.186949975 +0000
4 @@ -338,7 +338,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-4.1.0.orig/docs/auth.html.in libvirt-4.1.0/docs/auth.html.in
14 --- libvirt-4.1.0.orig/docs/auth.html.in 2017-08-29 08:38:20.000000000 +0000
15 +++ libvirt-4.1.0/docs/auth.html.in 2018-03-12 10:51:10.186949975 +0000
16 @@ -267,7 +267,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-4.1.0.orig/libvirt.spec libvirt-4.1.0/libvirt.spec
26 --- libvirt-4.1.0.orig/libvirt.spec 2018-03-05 09:00:00.000000000 +0000
27 +++ libvirt-4.1.0/libvirt.spec 2018-03-12 10:51:10.199949975 +0000
28 @@ -2118,7 +2118,7 @@ exit 0
30 %{_datadir}/libvirt/test-screenshot.png
32 -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
33 +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
36 %{_mandir}/man1/virt-admin.1*
37 diff -urp libvirt-4.1.0.orig/libvirt.spec.in libvirt-4.1.0/libvirt.spec.in
38 --- libvirt-4.1.0.orig/libvirt.spec.in 2018-02-28 16:48:15.000000000 +0000
39 +++ libvirt-4.1.0/libvirt.spec.in 2018-03-12 10:51:10.199949975 +0000
40 @@ -2118,7 +2118,7 @@ exit 0
42 %{_datadir}/libvirt/test-screenshot.png
44 -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
45 +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
48 %{_mandir}/man1/virt-admin.1*
49 diff -urp libvirt-4.1.0.orig/src/Makefile.am libvirt-4.1.0/src/Makefile.am
50 --- libvirt-4.1.0.orig/src/Makefile.am 2018-03-05 08:57:31.000000000 +0000
51 +++ libvirt-4.1.0/src/Makefile.am 2018-03-12 10:52:52.804948819 +0000
52 @@ -2300,13 +2300,13 @@ endif ! WITH_LIBVIRTD
53 # the WITH_LIBVIRTD conditional
56 - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
57 + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
58 $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
59 - $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
60 + $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
63 - rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
64 - rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
65 + rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
66 + rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
70 diff -urp libvirt-4.1.0.orig/src/Makefile.in libvirt-4.1.0/src/Makefile.in
71 --- libvirt-4.1.0.orig/src/Makefile.in 2018-03-05 08:59:17.000000000 +0000
72 +++ libvirt-4.1.0/src/Makefile.in 2018-03-12 10:53:22.637948484 +0000
73 @@ -12931,13 +12931,13 @@ uninstall-sysconfig:
74 # This is needed for clients too, so can't wrap in
75 # the WITH_LIBVIRTD conditional
76 @WITH_SASL_TRUE@install-sasl:
77 -@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
78 +@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
79 @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
80 -@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
81 +@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
83 @WITH_SASL_TRUE@uninstall-sasl:
84 -@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
85 -@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
86 +@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
87 +@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
88 @WITH_SASL_FALSE@install-sasl:
89 @WITH_SASL_FALSE@uninstall-sasl:
91 diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf
92 --- libvirt-4.1.0.orig/src/qemu/qemu.conf 2018-01-12 14:48:37.000000000 +0000
93 +++ libvirt-4.1.0/src/qemu/qemu.conf 2018-03-12 10:51:10.199949975 +0000
95 # Examples include vinagre, virt-viewer and virt-manager
96 # itself. UltraVNC, RealVNC, TightVNC do not support this
98 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
99 +# It is necessary to configure /etc/sasl/qemu.conf to choose
100 # the desired SASL plugin (eg, GSSPI for Kerberos)
105 -# The default SASL configuration file is located in /etc/sasl2/
106 +# The default SASL configuration file is located in /etc/sasl/
107 # When running libvirtd unprivileged, it may be desirable to
108 # override the configs in this location. Set this parameter to
109 # point to the directory, and create a qemu.conf in that location
111 -#vnc_sasl_dir = "/some/directory/sasl2"
112 +#vnc_sasl_dir = "/some/directory/sasl"
115 # QEMU implements an extension for providing audio over a VNC connection,
116 @@ -205,17 +205,17 @@
117 # Enable use of SASL encryption on the SPICE server. This requires
118 # a SPICE client which supports the SASL protocol extension.
120 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
121 +# It is necessary to configure /etc/sasl/qemu.conf to choose
122 # the desired SASL plugin (eg, GSSPI for Kerberos)
126 -# The default SASL configuration file is located in /etc/sasl2/
127 +# The default SASL configuration file is located in /etc/sasl/
128 # When running libvirtd unprivileged, it may be desirable to
129 # override the configs in this location. Set this parameter to
130 # point to the directory, and create a qemu.conf in that location
132 -#spice_sasl_dir = "/some/directory/sasl2"
133 +#spice_sasl_dir = "/some/directory/sasl"
135 # Enable use of TLS encryption on the chardev TCP transports.
137 diff -urp libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.1.0/src/qemu/test_libvirtd_qemu.aug.in
138 --- libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2017-09-29 07:30:58.000000000 +0000
139 +++ libvirt-4.1.0/src/qemu/test_libvirtd_qemu.aug.in 2018-03-12 10:51:10.199949975 +0000
140 @@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
141 { "vnc_tls_x509_verify" = "1" }
142 { "vnc_password" = "XYZ12345" }
144 -{ "vnc_sasl_dir" = "/some/directory/sasl2" }
145 +{ "vnc_sasl_dir" = "/some/directory/sasl" }
146 { "vnc_allow_host_audio" = "0" }
147 { "spice_listen" = "0.0.0.0" }
148 { "spice_tls" = "1" }
149 @@ -20,7 +20,7 @@ module Test_libvirtd_qemu =
150 { "spice_auto_unix_socket" = "1" }
151 { "spice_password" = "XYZ12345" }
152 { "spice_sasl" = "1" }
153 -{ "spice_sasl_dir" = "/some/directory/sasl2" }
154 +{ "spice_sasl_dir" = "/some/directory/sasl" }
155 { "chardev_tls" = "1" }
156 { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
157 { "chardev_tls_x509_verify" = "1" }
158 diff -urp libvirt-4.1.0.orig/src/remote/libvirtd.conf libvirt-4.1.0/src/remote/libvirtd.conf
159 --- libvirt-4.1.0.orig/src/remote/libvirtd.conf 2018-02-26 09:02:18.000000000 +0000
160 +++ libvirt-4.1.0/src/remote/libvirtd.conf 2018-03-12 10:52:04.539949363 +0000
162 # the network providing auth (eg, TLS/x509 certificates)
164 # - sasl: use SASL infrastructure. The actual auth scheme is then
165 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
166 +# controlled from /etc/sasl/libvirt.conf. For the TCP
167 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
168 # For non-TCP or TLS sockets, any scheme is allowed.
171 # If you don't enable SASL, then all TCP traffic is cleartext.
172 # Don't do this outside of a dev/test scenario. For real world
173 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
174 -# mechanism in /etc/sasl2/libvirt.conf
175 +# mechanism in /etc/sasl/libvirt.conf
178 # Change the authentication scheme for TLS sockets.
179 diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
180 --- libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-12 14:48:37.000000000 +0000
181 +++ libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-03-12 10:51:10.199949975 +0000
182 @@ -3,7 +3,7 @@ PATH=/bin \
186 -SASL_CONF_PATH=/root/.sasl2 \
187 +SASL_CONF_PATH=/root/.sasl \
188 QEMU_AUDIO_DRV=none \
189 /usr/bin/qemu-system-i686 \
191 diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
192 --- libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-12 14:48:37.000000000 +0000
193 +++ libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-03-12 10:51:10.199949975 +0000
194 @@ -3,7 +3,7 @@ PATH=/bin \
198 -SASL_CONF_PATH=/root/.sasl2 \
199 +SASL_CONF_PATH=/root/.sasl \
200 QEMU_AUDIO_DRV=none \
201 /usr/bin/qemu-system-i686 \
203 diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
204 --- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-12 14:48:37.000000000 +0000
205 +++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-03-12 10:51:10.200949975 +0000
206 @@ -3,7 +3,7 @@ PATH=/bin \
210 -SASL_CONF_PATH=/root/.sasl2 \
211 +SASL_CONF_PATH=/root/.sasl \
212 QEMU_AUDIO_DRV=spice \
213 /usr/bin/qemu-system-i686 \
215 diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
216 --- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-12 14:48:37.000000000 +0000
217 +++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-03-12 10:51:10.200949975 +0000
218 @@ -3,7 +3,7 @@ PATH=/bin \
222 -SASL_CONF_PATH=/root/.sasl2 \
223 +SASL_CONF_PATH=/root/.sasl \
224 QEMU_AUDIO_DRV=none \
225 /usr/bin/qemu-system-i686 \
227 diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
228 --- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-12 14:48:37.000000000 +0000
229 +++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-03-12 10:51:10.200949975 +0000
230 @@ -3,7 +3,7 @@ PATH=/bin \
234 -SASL_CONF_PATH=/root/.sasl2 \
235 +SASL_CONF_PATH=/root/.sasl \
236 QEMU_AUDIO_DRV=none \
237 /usr/bin/qemu-system-i686 \
239 diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvtest.c libvirt-4.1.0/tests/qemuxml2argvtest.c
240 --- libvirt-4.1.0.orig/tests/qemuxml2argvtest.c 2018-02-26 09:02:18.000000000 +0000
241 +++ libvirt-4.1.0/tests/qemuxml2argvtest.c 2018-03-12 10:51:10.207949975 +0000
242 @@ -1097,7 +1097,7 @@ mymain(void)
244 driver.config->vncSASL = 1;
245 VIR_FREE(driver.config->vncSASLdir);
246 - ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
247 + ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
248 DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
249 driver.config->vncTLS = 1;
250 driver.config->vncTLSx509verify = 1;
251 @@ -1121,7 +1121,7 @@ mymain(void)
252 DO_TEST("graphics-spice-no-args",
253 QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
254 driver.config->spiceSASL = 1;
255 - ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
256 + ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
257 DO_TEST("graphics-spice-sasl",
259 QEMU_CAPS_DEVICE_QXL);
260 diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.1.0/tests/virconfdata/libvirtd.conf
261 --- libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf 2017-10-30 07:32:36.000000000 +0000
262 +++ libvirt-4.1.0/tests/virconfdata/libvirtd.conf 2018-03-12 10:51:10.218949974 +0000
263 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
264 # the network providing auth (eg, TLS/x509 certificates)
266 # - sasl: use SASL infrastructure. The actual auth scheme is then
267 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
268 +# controlled from /etc/sasl/libvirt.conf. For the TCP
269 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
270 # For non-TCP or TLS sockets, any scheme is allowed.
272 @@ -139,7 +139,7 @@ auth_unix_rw = "none"
273 # If you don't enable SASL, then all TCP traffic is cleartext.
274 # Don't do this outside of a dev/test scenario. For real world
275 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
276 -# mechanism in /etc/sasl2/libvirt.conf
277 +# mechanism in /etc/sasl/libvirt.conf
280 # Change the authentication scheme for TLS sockets.
281 diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out libvirt-4.1.0/tests/virconfdata/libvirtd.out
282 --- libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out 2017-10-30 07:32:36.000000000 +0000
283 +++ libvirt-4.1.0/tests/virconfdata/libvirtd.out 2018-03-12 10:51:10.218949974 +0000
284 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
285 # the network providing auth (eg, TLS/x509 certificates)
287 # - sasl: use SASL infrastructure. The actual auth scheme is then
288 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
289 +# controlled from /etc/sasl/libvirt.conf. For the TCP
290 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
291 # For non-TCP or TLS sockets, any scheme is allowed.
293 @@ -116,7 +116,7 @@ auth_unix_rw = "none"
294 # If you don't enable SASL, then all TCP traffic is cleartext.
295 # Don't do this outside of a dev/test scenario. For real world
296 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
297 -# mechanism in /etc/sasl2/libvirt.conf
298 +# mechanism in /etc/sasl/libvirt.conf
300 # Change the authentication scheme for TLS sockets.