1 diff -urp libvirt-4.5.0.orig/docs/auth.html libvirt-4.5.0/docs/auth.html
2 --- libvirt-4.5.0.orig/docs/auth.html 2018-07-09 16:24:49.467875585 +0000
3 +++ libvirt-4.5.0/docs/auth.html 2018-07-09 16:25:07.306874521 +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.5.0.orig/docs/auth.html.in libvirt-4.5.0/docs/auth.html.in
14 --- libvirt-4.5.0.orig/docs/auth.html.in 2018-07-09 16:24:49.471875584 +0000
15 +++ libvirt-4.5.0/docs/auth.html.in 2018-07-09 16:25:07.307874521 +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.5.0.orig/src/Makefile.in libvirt-4.5.0/src/Makefile.in
26 --- libvirt-4.5.0.orig/src/Makefile.in 2018-07-09 16:24:49.542875580 +0000
27 +++ libvirt-4.5.0/src/Makefile.in 2018-07-09 16:25:07.311874521 +0000
28 @@ -13166,13 +13166,13 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
29 # This is needed for clients too, so can't wrap in
30 # the WITH_LIBVIRTD conditional
31 @WITH_SASL_TRUE@install-sasl:
32 -@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
33 +@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
34 @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
35 -@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
36 +@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
38 @WITH_SASL_TRUE@uninstall-sasl:
39 -@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
40 -@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
41 +@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
42 +@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
43 @WITH_SASL_FALSE@install-sasl:
44 @WITH_SASL_FALSE@uninstall-sasl:
46 diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
47 --- libvirt-4.5.0.orig/src/qemu/qemu.conf 2018-07-09 16:24:49.520875581 +0000
48 +++ libvirt-4.5.0/src/qemu/qemu.conf 2018-07-09 16:25:07.311874521 +0000
50 # Examples include vinagre, virt-viewer and virt-manager
51 # itself. UltraVNC, RealVNC, TightVNC do not support this
53 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
54 +# It is necessary to configure /etc/sasl/qemu.conf to choose
55 # the desired SASL plugin (eg, GSSPI for Kerberos)
60 -# The default SASL configuration file is located in /etc/sasl2/
61 +# The default SASL configuration file is located in /etc/sasl/
62 # When running libvirtd unprivileged, it may be desirable to
63 # override the configs in this location. Set this parameter to
64 # point to the directory, and create a qemu.conf in that location
66 -#vnc_sasl_dir = "/some/directory/sasl2"
67 +#vnc_sasl_dir = "/some/directory/sasl"
70 # QEMU implements an extension for providing audio over a VNC connection,
72 # Enable use of SASL encryption on the SPICE server. This requires
73 # a SPICE client which supports the SASL protocol extension.
75 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
76 +# It is necessary to configure /etc/sasl/qemu.conf to choose
77 # the desired SASL plugin (eg, GSSPI for Kerberos)
81 -# The default SASL configuration file is located in /etc/sasl2/
82 +# The default SASL configuration file is located in /etc/sasl/
83 # When running libvirtd unprivileged, it may be desirable to
84 # override the configs in this location. Set this parameter to
85 # point to the directory, and create a qemu.conf in that location
87 -#spice_sasl_dir = "/some/directory/sasl2"
88 +#spice_sasl_dir = "/some/directory/sasl"
90 # Enable use of TLS encryption on the chardev TCP transports.
92 diff -urp libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in
93 --- libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2018-07-09 16:24:49.520875581 +0000
94 +++ libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in 2018-07-09 16:25:07.312874521 +0000
95 @@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
96 { "vnc_tls_x509_verify" = "1" }
97 { "vnc_password" = "XYZ12345" }
99 -{ "vnc_sasl_dir" = "/some/directory/sasl2" }
100 +{ "vnc_sasl_dir" = "/some/directory/sasl" }
101 { "vnc_allow_host_audio" = "0" }
102 { "spice_listen" = "0.0.0.0" }
103 { "spice_tls" = "1" }
104 @@ -20,7 +20,7 @@ module Test_libvirtd_qemu =
105 { "spice_auto_unix_socket" = "1" }
106 { "spice_password" = "XYZ12345" }
107 { "spice_sasl" = "1" }
108 -{ "spice_sasl_dir" = "/some/directory/sasl2" }
109 +{ "spice_sasl_dir" = "/some/directory/sasl" }
110 { "chardev_tls" = "1" }
111 { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
112 { "chardev_tls_x509_verify" = "1" }
113 diff -urp libvirt-4.5.0.orig/src/remote/libvirtd.conf libvirt-4.5.0/src/remote/libvirtd.conf
114 --- libvirt-4.5.0.orig/src/remote/libvirtd.conf 2018-07-09 16:24:49.523875581 +0000
115 +++ libvirt-4.5.0/src/remote/libvirtd.conf 2018-07-09 16:25:07.312874521 +0000
117 # the network providing auth (eg, TLS/x509 certificates)
119 # - sasl: use SASL infrastructure. The actual auth scheme is then
120 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
121 +# controlled from /etc/sasl/libvirt.conf. For the TCP
122 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
123 # For non-TCP or TLS sockets, any scheme is allowed.
126 # If you don't enable SASL, then all TCP traffic is cleartext.
127 # Don't do this outside of a dev/test scenario. For real world
128 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
129 -# mechanism in /etc/sasl2/libvirt.conf
130 +# mechanism in /etc/sasl/libvirt.conf
133 # Change the authentication scheme for TLS sockets.
134 diff -urp libvirt-4.5.0.orig/src/remote/Makefile.inc.am libvirt-4.5.0/src/remote/Makefile.inc.am
135 --- libvirt-4.5.0.orig/src/remote/Makefile.inc.am 2018-07-09 16:24:49.520875581 +0000
136 +++ libvirt-4.5.0/src/remote/Makefile.inc.am 2018-07-09 16:25:07.312874521 +0000
137 @@ -248,13 +248,13 @@ endif ! WITH_LIBVIRTD
138 # the WITH_LIBVIRTD conditional
141 - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
142 + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
143 $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
144 - $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
145 + $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
148 - rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
149 - rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
150 + rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
151 + rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
155 diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
156 --- libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-07-09 16:24:50.006875552 +0000
157 +++ libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-07-09 16:25:07.312874521 +0000
158 @@ -3,7 +3,7 @@ PATH=/bin \
162 -SASL_CONF_PATH=/root/.sasl2 \
163 +SASL_CONF_PATH=/root/.sasl \
164 QEMU_AUDIO_DRV=none \
165 /usr/bin/qemu-system-i686 \
167 diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
168 --- libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-07-09 16:24:50.006875552 +0000
169 +++ libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-07-09 16:25:07.312874521 +0000
170 @@ -3,7 +3,7 @@ PATH=/bin \
174 -SASL_CONF_PATH=/root/.sasl2 \
175 +SASL_CONF_PATH=/root/.sasl \
176 QEMU_AUDIO_DRV=none \
177 /usr/bin/qemu-system-i686 \
179 diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
180 --- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-07-09 16:24:49.567875579 +0000
181 +++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-07-09 16:25:07.312874521 +0000
182 @@ -3,7 +3,7 @@ PATH=/bin \
186 -SASL_CONF_PATH=/root/.sasl2 \
187 +SASL_CONF_PATH=/root/.sasl \
188 QEMU_AUDIO_DRV=spice \
189 /usr/bin/qemu-system-i686 \
191 diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
192 --- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-07-09 16:24:49.567875579 +0000
193 +++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-07-09 16:25:07.312874521 +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.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
204 --- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-07-09 16:24:49.567875579 +0000
205 +++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-07-09 16:25:07.313874521 +0000
206 @@ -3,7 +3,7 @@ PATH=/bin \
210 -SASL_CONF_PATH=/root/.sasl2 \
211 +SASL_CONF_PATH=/root/.sasl \
212 QEMU_AUDIO_DRV=none \
213 /usr/bin/qemu-system-i686 \
215 diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvtest.c libvirt-4.5.0/tests/qemuxml2argvtest.c
216 --- libvirt-4.5.0.orig/tests/qemuxml2argvtest.c 2018-07-09 16:24:49.831875563 +0000
217 +++ libvirt-4.5.0/tests/qemuxml2argvtest.c 2018-07-09 16:25:07.313874521 +0000
218 @@ -1190,7 +1190,7 @@ mymain(void)
220 driver.config->vncSASL = 1;
221 VIR_FREE(driver.config->vncSASLdir);
222 - ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
223 + ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
224 DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
225 driver.config->vncTLS = 1;
226 driver.config->vncTLSx509verify = 1;
227 @@ -1210,7 +1210,7 @@ mymain(void)
228 DO_TEST("graphics-spice-no-args",
229 QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
230 driver.config->spiceSASL = 1;
231 - ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
232 + ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
233 DO_TEST("graphics-spice-sasl",
235 QEMU_CAPS_DEVICE_QXL);
236 diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.5.0/tests/virconfdata/libvirtd.conf
237 --- libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf 2018-07-09 16:24:49.818875564 +0000
238 +++ libvirt-4.5.0/tests/virconfdata/libvirtd.conf 2018-07-09 16:25:07.313874521 +0000
239 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
240 # the network providing auth (eg, TLS/x509 certificates)
242 # - sasl: use SASL infrastructure. The actual auth scheme is then
243 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
244 +# controlled from /etc/sasl/libvirt.conf. For the TCP
245 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
246 # For non-TCP or TLS sockets, any scheme is allowed.
248 @@ -139,7 +139,7 @@ auth_unix_rw = "none"
249 # If you don't enable SASL, then all TCP traffic is cleartext.
250 # Don't do this outside of a dev/test scenario. For real world
251 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
252 -# mechanism in /etc/sasl2/libvirt.conf
253 +# mechanism in /etc/sasl/libvirt.conf
256 # Change the authentication scheme for TLS sockets.
257 diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.out libvirt-4.5.0/tests/virconfdata/libvirtd.out
258 --- libvirt-4.5.0.orig/tests/virconfdata/libvirtd.out 2018-07-09 16:24:49.818875564 +0000
259 +++ libvirt-4.5.0/tests/virconfdata/libvirtd.out 2018-07-09 16:25:07.313874521 +0000
260 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
261 # the network providing auth (eg, TLS/x509 certificates)
263 # - sasl: use SASL infrastructure. The actual auth scheme is then
264 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
265 +# controlled from /etc/sasl/libvirt.conf. For the TCP
266 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
267 # For non-TCP or TLS sockets, any scheme is allowed.
269 @@ -116,7 +116,7 @@ auth_unix_rw = "none"
270 # If you don't enable SASL, then all TCP traffic is cleartext.
271 # Don't do this outside of a dev/test scenario. For real world
272 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
273 -# mechanism in /etc/sasl2/libvirt.conf
274 +# mechanism in /etc/sasl/libvirt.conf
276 # Change the authentication scheme for TLS sockets.