diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/krb5-admin-server.config | 11 | ||||
| -rw-r--r-- | debian/krb5-admin-server.postinst | 27 |
3 files changed, 8 insertions, 37 deletions
diff --git a/debian/changelog b/debian/changelog index 95b83013f..c50efd547 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +krb5 (1.17-2) unstable; urgency=medium + + * Finish removing the run kadmind debconf template which was obsoleted + when the systemd units were installed, LP: #1817376 + + -- Sam Hartman <hartmans@debian.org> Mon, 25 Feb 2019 13:55:57 -0500 + krb5 (1.17-1) unstable; urgency=low * New Upstream release diff --git a/debian/krb5-admin-server.config b/debian/krb5-admin-server.config index 6c5afda4e..99e4aaef5 100644 --- a/debian/krb5-admin-server.config +++ b/debian/krb5-admin-server.config @@ -8,14 +8,3 @@ db_version 2.0 db_input high krb5-admin-server/newrealm || true db_go -db_get krb5-kdc/debconf -if [ x"$RET" = xtrue ] ; then - if [ -f "/etc/default/krb5-admin-server" ] ; then - . /etc/default/krb5-admin-server - if [ -n "$RUN_KADMIND" ] ; then - db_set krb5-admin-server/kadmind "$RUN_KADMIND" - fi - fi - db_input low krb5-admin-server/kadmind || true - db_go -fi diff --git a/debian/krb5-admin-server.postinst b/debian/krb5-admin-server.postinst index 724000587..51bb317ce 100644 --- a/debian/krb5-admin-server.postinst +++ b/debian/krb5-admin-server.postinst @@ -1,37 +1,12 @@ #! /bin/sh set -e +# This script is really only needed to display the newrealm note. if [ "configure" = "$1" ] || [ "reconfigure" = "$1" ] ; then . /usr/share/debconf/confmodule db_version 2.0 - db_get krb5-kdc/debconf - DEBCONF="$RET" - - if [ $DEBCONF = "true" ] ; then - if [ -f "/etc/default/krb5-admin-server" ] ; then - . /etc/default/krb5-admin-server - fi - cat <<'EOF' > /etc/default/krb5-admin-server -# Automatically generated. If you change anything in this file other than the -# values of DAEMON_ARGS, first run dpkg-reconfigure -# krb5-admin-server and disable managing the kadmin configuration with -# debconf. Otherwise, changes will be overwritten. - -EOF - db_get krb5-admin-server/kadmind ||true - RUN_KADMIND="$RET" - if dpkg --compare-versions "$2" le-nl 1.12.1+dfsg-11; then - if [ "x$RUN_KADMIND" = "xfalse" ]; then - update-rc.d krb5-admin-server disable - fi - fi - if [ -n "$DAEMON_ARGS" ] ; then - echo "DAEMON_ARGS=\"$DAEMON_ARGS\"" \ - >> /etc/default/krb5-admin-server - fi - fi db_stop fi |