1 diff -urp libvirt-1.3.2.orig/daemon/libvirtd.conf libvirt-1.3.2/daemon/libvirtd.conf
2 --- libvirt-1.3.2.orig/daemon/libvirtd.conf 2016-01-10 01:57:37.000000000 +0000
3 +++ libvirt-1.3.2/daemon/libvirtd.conf 2016-03-18 06:57:24.113768000 +0000
5 # the network providing auth (eg, TLS/x509 certificates)
7 # - sasl: use SASL infrastructure. The actual auth scheme is then
8 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
9 +# controlled from /etc/sasl/libvirt.conf. For the TCP
10 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
11 # For non-TCP or TLS sockets, any scheme is allowed.
14 # If you don't enable SASL, then all TCP traffic is cleartext.
15 # Don't do this outside of a dev/test scenario. For real world
16 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
17 -# mechanism in /etc/sasl2/libvirt.conf
18 +# mechanism in /etc/sasl/libvirt.conf
21 # Change the authentication scheme for TLS sockets.
22 diff -urp libvirt-1.3.2.orig/daemon/Makefile.am libvirt-1.3.2/daemon/Makefile.am
23 --- libvirt-1.3.2.orig/daemon/Makefile.am 2016-02-24 01:55:16.000000000 +0000
24 +++ libvirt-1.3.2/daemon/Makefile.am 2016-03-18 06:57:24.114768000 +0000
25 @@ -521,13 +521,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in
26 # the WITH_LIBVIRTD conditional
29 - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
30 + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
31 $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
32 - $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
33 + $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
36 - rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
37 - rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
38 + rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
39 + rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
43 diff -urp libvirt-1.3.2.orig/daemon/Makefile.in libvirt-1.3.2/daemon/Makefile.in
44 --- libvirt-1.3.2.orig/daemon/Makefile.in 2016-03-01 03:19:22.000000000 +0000
45 +++ libvirt-1.3.2/daemon/Makefile.in 2016-03-18 12:16:33.415768000 +0000
46 @@ -2832,13 +2832,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in
47 # This is needed for clients too, so can't wrap in
48 # the WITH_LIBVIRTD conditional
49 @WITH_SASL_TRUE@install-data-sasl:
50 -@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
51 +@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
52 @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
53 -@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
54 +@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
56 @WITH_SASL_TRUE@uninstall-data-sasl:
57 -@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
58 -@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
59 +@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
60 +@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
61 @WITH_SASL_FALSE@install-data-sasl:
62 @WITH_SASL_FALSE@uninstall-data-sasl:
64 diff -urp libvirt-1.3.2.orig/docs/auth.html libvirt-1.3.2/docs/auth.html
65 --- libvirt-1.3.2.orig/docs/auth.html 2016-02-24 01:58:13.000000000 +0000
66 +++ libvirt-1.3.2/docs/auth.html 2016-03-18 06:57:24.115768000 +0000
67 @@ -400,7 +400,7 @@ again:
68 The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
69 The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
70 username+password style authentication. To enable Kerberos single-sign-on instead,
71 -the libvirt SASL configuration file must be changed. This is <code>/etc/sasl2/libvirt.conf</code>.
72 +the libvirt SASL configuration file must be changed. This is <code>/etc/sasl/libvirt.conf</code>.
73 The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
74 instead of the default <code>digest-md5</code>, and keytab should be set to
75 <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
76 diff -urp libvirt-1.3.2.orig/docs/auth.html.in libvirt-1.3.2/docs/auth.html.in
77 --- libvirt-1.3.2.orig/docs/auth.html.in 2015-01-23 11:44:53.000000000 +0000
78 +++ libvirt-1.3.2/docs/auth.html.in 2016-03-18 06:57:24.116768000 +0000
79 @@ -234,7 +234,7 @@ again:
80 The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
81 The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
82 username+password style authentication. To enable Kerberos single-sign-on instead,
83 -the libvirt SASL configuration file must be changed. This is <code>/etc/sasl2/libvirt.conf</code>.
84 +the libvirt SASL configuration file must be changed. This is <code>/etc/sasl/libvirt.conf</code>.
85 The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
86 instead of the default <code>digest-md5</code>, and keytab should be set to
87 <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
88 diff -urp libvirt-1.3.2.orig/libvirt.spec libvirt-1.3.2/libvirt.spec
89 --- libvirt-1.3.2.orig/libvirt.spec 2016-03-01 03:20:27.000000000 +0000
90 +++ libvirt-1.3.2/libvirt.spec 2016-03-18 06:57:24.118768000 +0000
91 @@ -2316,7 +2316,7 @@ exit 0
92 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
95 -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
96 +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
100 diff -urp libvirt-1.3.2.orig/libvirt.spec.in libvirt-1.3.2/libvirt.spec.in
101 --- libvirt-1.3.2.orig/libvirt.spec.in 2016-03-01 03:18:39.000000000 +0000
102 +++ libvirt-1.3.2/libvirt.spec.in 2016-03-18 06:57:24.119768000 +0000
103 @@ -2316,7 +2316,7 @@ exit 0
104 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
107 -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
108 +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
111 %if %{with_wireshark}
112 diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf
113 --- libvirt-1.3.2.orig/src/qemu/qemu.conf 2015-11-27 12:43:23.000000000 +0000
114 +++ libvirt-1.3.2/src/qemu/qemu.conf 2016-03-18 12:16:11.751768000 +0000
116 # Examples include vinagre, virt-viewer and virt-manager
117 # itself. UltraVNC, RealVNC, TightVNC do not support this
119 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
120 +# It is necessary to configure /etc/sasl/qemu.conf to choose
121 # 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 -#vnc_sasl_dir = "/some/directory/sasl2"
133 +#vnc_sasl_dir = "/some/directory/sasl"
136 # QEMU implements an extension for providing audio over a VNC connection,
137 @@ -143,17 +143,17 @@
138 # Enable use of SASL encryption on the SPICE server. This requires
139 # a SPICE client which supports the SASL protocol extension.
141 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
142 +# It is necessary to configure /etc/sasl/qemu.conf to choose
143 # the desired SASL plugin (eg, GSSPI for Kerberos)
147 -# The default SASL configuration file is located in /etc/sasl2/
148 +# The default SASL configuration file is located in /etc/sasl/
149 # When running libvirtd unprivileged, it may be desirable to
150 # override the configs in this location. Set this parameter to
151 # point to the directory, and create a qemu.conf in that location
153 -#spice_sasl_dir = "/some/directory/sasl2"
154 +#spice_sasl_dir = "/some/directory/sasl"
157 # By default, if no graphical front end is configured, libvirt will disable
158 diff -urp libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.2/src/qemu/test_libvirtd_qemu.aug.in
159 --- libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in 2015-11-27 12:43:23.000000000 +0000
160 +++ libvirt-1.3.2/src/qemu/test_libvirtd_qemu.aug.in 2016-03-18 12:16:00.319768000 +0000
161 @@ -9,14 +9,14 @@ module Test_libvirtd_qemu =
162 { "vnc_tls_x509_verify" = "1" }
163 { "vnc_password" = "XYZ12345" }
165 -{ "vnc_sasl_dir" = "/some/directory/sasl2" }
166 +{ "vnc_sasl_dir" = "/some/directory/sasl" }
167 { "vnc_allow_host_audio" = "0" }
168 { "spice_listen" = "0.0.0.0" }
169 { "spice_tls" = "1" }
170 { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" }
171 { "spice_password" = "XYZ12345" }
172 { "spice_sasl" = "1" }
173 -{ "spice_sasl_dir" = "/some/directory/sasl2" }
174 +{ "spice_sasl_dir" = "/some/directory/sasl" }
175 { "nographics_allow_host_audio" = "1" }
176 { "remote_display_port_min" = "5900" }
177 { "remote_display_port_max" = "65535" }
178 diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.conf libvirt-1.3.2/tests/confdata/libvirtd.conf
179 --- libvirt-1.3.2.orig/tests/confdata/libvirtd.conf 2015-06-28 03:29:13.000000000 +0000
180 +++ libvirt-1.3.2/tests/confdata/libvirtd.conf 2016-03-18 06:57:24.120768000 +0000
181 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
182 # the network providing auth (eg, TLS/x509 certificates)
184 # - sasl: use SASL infrastructure. The actual auth scheme is then
185 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
186 +# controlled from /etc/sasl/libvirt.conf. For the TCP
187 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
188 # For non-TCP or TLS sockets, any scheme is allowed.
190 @@ -139,7 +139,7 @@ auth_unix_rw = "none"
191 # If you don't enable SASL, then all TCP traffic is cleartext.
192 # Don't do this outside of a dev/test scenario. For real world
193 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
194 -# mechanism in /etc/sasl2/libvirt.conf
195 +# mechanism in /etc/sasl/libvirt.conf
198 # Change the authentication scheme for TLS sockets.
199 diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.out libvirt-1.3.2/tests/confdata/libvirtd.out
200 --- libvirt-1.3.2.orig/tests/confdata/libvirtd.out 2015-06-28 03:29:13.000000000 +0000
201 +++ libvirt-1.3.2/tests/confdata/libvirtd.out 2016-03-18 06:57:24.121768000 +0000
202 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
203 # the network providing auth (eg, TLS/x509 certificates)
205 # - sasl: use SASL infrastructure. The actual auth scheme is then
206 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
207 +# controlled from /etc/sasl/libvirt.conf. For the TCP
208 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
209 # For non-TCP or TLS sockets, any scheme is allowed.
211 @@ -116,7 +116,7 @@ auth_unix_rw = "none"
212 # If you don't enable SASL, then all TCP traffic is cleartext.
213 # Don't do this outside of a dev/test scenario. For real world
214 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
215 -# mechanism in /etc/sasl2/libvirt.conf
216 +# mechanism in /etc/sasl/libvirt.conf
218 # Change the authentication scheme for TLS sockets.
220 diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
221 --- libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-02-16 14:25:07.000000000 +0000
222 +++ libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-03-18 12:15:39.783768000 +0000
223 @@ -3,7 +3,7 @@ PATH=/bin \
227 -SASL_CONF_PATH=/root/.sasl2 \
228 +SASL_CONF_PATH=/root/.sasl \
229 QEMU_AUDIO_DRV=none \
232 diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
233 --- libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-02-16 14:25:07.000000000 +0000
234 +++ libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-03-18 12:15:42.431768000 +0000
235 @@ -3,7 +3,7 @@ PATH=/bin \
239 -SASL_CONF_PATH=/root/.sasl2 \
240 +SASL_CONF_PATH=/root/.sasl \
241 QEMU_AUDIO_DRV=none \
244 diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
245 --- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-01-10 01:57:37.000000000 +0000
246 +++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-03-18 12:13:04.244768000 +0000
247 @@ -3,7 +3,7 @@ PATH=/bin \
251 -SASL_CONF_PATH=/root/.sasl2 \
252 +SASL_CONF_PATH=/root/.sasl \
253 QEMU_AUDIO_DRV=spice \
256 diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
257 --- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-02-16 14:25:07.000000000 +0000
258 +++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-03-18 12:12:18.798768000 +0000
259 @@ -3,7 +3,7 @@ PATH=/bin \
263 -SASL_CONF_PATH=/root/.sasl2 \
264 +SASL_CONF_PATH=/root/.sasl \
265 QEMU_AUDIO_DRV=none \
268 diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
269 --- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-02-16 14:25:07.000000000 +0000
270 +++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-03-18 12:12:35.964768000 +0000
271 @@ -3,7 +3,7 @@ PATH=/bin \
275 -SASL_CONF_PATH=/root/.sasl2 \
276 +SASL_CONF_PATH=/root/.sasl \
277 QEMU_AUDIO_DRV=none \
280 diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvtest.c libvirt-1.3.2/tests/qemuxml2argvtest.c
281 --- libvirt-1.3.2.orig/tests/qemuxml2argvtest.c 2016-02-27 03:16:01.000000000 +0000
282 +++ libvirt-1.3.2/tests/qemuxml2argvtest.c 2016-03-18 12:11:24.793768000 +0000
283 @@ -921,7 +921,7 @@ mymain(void)
285 driver.config->vncSASL = 1;
286 VIR_FREE(driver.config->vncSASLdir);
287 - ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
288 + ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
289 DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC);
290 driver.config->vncTLS = 1;
291 driver.config->vncTLSx509verify = 1;
292 @@ -941,7 +941,7 @@ mymain(void)
293 QEMU_CAPS_DEVICE_QXL,
294 QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
295 driver.config->spiceSASL = 1;
296 - ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
297 + ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
298 DO_TEST("graphics-spice-sasl",