remote: Drop KRB5_KTNAME override

When the comment in libvirtd.sasl was last updated with

  commit fe772f24a6809b3d937ed6547cbaa9d820e514b6
  Author: Cole Robinson <crobinso@redhat.com>
  Date:   Sat Oct 20 14:10:03 2012 -0400

    daemon: Avoid 'Could not find keytab file' in syslog

it was noted that only old versions of kerberos would need the
environment variable to be set: that was more than seven years
ago, so it's safe to assume that none of our current target
platforms still requires that hack and setting the appropriate
key in the configuration file will be enough.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/remote/libvirtd.init.in b/src/remote/libvirtd.init.in
index b708befbc5a283aaafcf3fed4648f34e8d9bc33d..91228db411d36bd933265631efb21b85b284bd9a 100644 (file)
--- a/src/remote/libvirtd.init.in
+++ b/src/remote/libvirtd.init.in
@@ -7,7 +7,6 @@ LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
 
 command="@sbindir@/libvirtd"
 command_args="-d ${LIBVIRTD_OPTS}"
-start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
 pidfile="@runstatedir@/libvirtd.pid"
 retry="${LIBVIRTD_TERMTIMEOUT}"
 

diff --git a/src/remote/libvirtd.sasl b/src/remote/libvirtd.sasl
index 9e7699c75ad89dea7fffad090bfa9f1d356f6b93..7a45470a9d8f3e78b11b714bb1395dd8807f6bdc 100644 (file)
--- a/src/remote/libvirtd.sasl
+++ b/src/remote/libvirtd.sasl
@@ -33,9 +33,7 @@ mech_list: gssapi
 #   qemu+tcp://hostname/system?auth=sasl.gssapi
 #mech_list: scram-sha-1 gssapi
 
-# Some older builds of MIT kerberos on Linux ignore this option &
-# instead need KRB5_KTNAME env var.
-# For modern Linux, and other OS, this should be sufficient
+# File containing the service principal for libvirtd
 #
 keytab: /etc/libvirt/krb5.tab
 

diff --git a/src/remote/libvirtd.sysconf b/src/remote/libvirtd.sysconf
index ee9db22bab9aa448eb69dc27eeb708efdb9c8804..18aec1ba6777a1dda4c9a3758b1fa7e9d96dd833 100644 (file)
--- a/src/remote/libvirtd.sysconf
+++ b/src/remote/libvirtd.sysconf
@@ -11,9 +11,6 @@ LIBVIRTD_ARGS="--timeout 120"
 # can be used to listen on TCP/TLS sockets
 #LIBVIRTD_ARGS="--listen"
 
-# Override Kerberos service keytab for SASL/GSSAPI
-#KRB5_KTNAME=/etc/libvirt/krb5.tab
-
 # Override the QEMU/SDL default audio driver probing when
 # starting virtual machines using SDL graphics
 #

diff --git a/src/remote/virtproxyd.init.in b/src/remote/virtproxyd.init.in
index b644c084a9c4ffa97e6223719882e7a1b830ba2b..436b2b6c0df9b5becee49927602041ec31ea0f05 100644 (file)
--- a/src/remote/virtproxyd.init.in
+++ b/src/remote/virtproxyd.init.in
@@ -7,7 +7,6 @@ VIRTPROXYD_TIMEOUT=${VIRTPROXYD_TERMTIMEOUT:-"TERM/25/KILL/5"}
 
 command="@sbindir@/virtproxyd"
 command_args="-d ${VIRTPROXYD_OPTS}"
-start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
 pidfile="@runstatedir@/virtproxyd.pid"
 retry="${VIRTPROXYD_TERMTIMEOUT}"