From cb93428e07010584ef9b0a9dce2add5596c9a595 Mon Sep 17 00:00:00 2001 From: Karl Ramm Date: Sun, 22 Mar 2009 05:27:07 +0000 Subject: explicitly set the charset to unknown in zstat, zleave, and zshutdown_notify --- clients/zleave/zleave.c | 1 + clients/zshutdown_notify/zshutdown_notify.c | 1 + clients/zstat/zstat.c | 1 + debian/README.krb4-5 | 1 + debian/libzephyr4-krb5.templates | 15 +++++++++++++++ debian/rules | 7 ++++++- debian/zephyr-server.templates | 17 +++++++++++++++++ 7 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 debian/README.krb4-5 create mode 100644 debian/libzephyr4-krb5.templates diff --git a/clients/zleave/zleave.c b/clients/zleave/zleave.c index e7ce4b6..0a652a2 100644 --- a/clients/zleave/zleave.c +++ b/clients/zleave/zleave.c @@ -335,6 +335,7 @@ bother(long slp, (void) memset((char *)¬ice, 0, sizeof(notice)); notice.z_kind = ACKED; notice.z_port = 0; + notice.z_charset = ZCHARSET_UNKNOWN; notice.z_class = MESSAGE_CLASS; notice.z_class_inst = INSTANCE; notice.z_recipient = ZGetSender(); diff --git a/clients/zshutdown_notify/zshutdown_notify.c b/clients/zshutdown_notify/zshutdown_notify.c index 4e2eaa0..067a813 100644 --- a/clients/zshutdown_notify/zshutdown_notify.c +++ b/clients/zshutdown_notify/zshutdown_notify.c @@ -120,6 +120,7 @@ main(int argc, notice.z_kind = N_KIND; notice.z_port = 0; + notice.z_charset = ZCHARSET_UNKNOWN; notice.z_class = N_CLASS; notice.z_class_inst = hostname; notice.z_opcode = N_OPCODE; diff --git a/clients/zstat/zstat.c b/clients/zstat/zstat.c index 2e0be61..944c4fc 100644 --- a/clients/zstat/zstat.c +++ b/clients/zstat/zstat.c @@ -237,6 +237,7 @@ srv_stat(char *host) (void) memset((char *)¬ice, 0, sizeof(notice)); notice.z_kind = UNSAFE; notice.z_port = 0; + notice.z_charset = ZCHARSET_UNKNOWN; notice.z_class = ZEPHYR_ADMIN_CLASS; notice.z_class_inst = ""; notice.z_opcode = ADMIN_STATUS; diff --git a/debian/README.krb4-5 b/debian/README.krb4-5 new file mode 100644 index 0000000..3278453 --- /dev/null +++ b/debian/README.krb4-5 @@ -0,0 +1 @@ +Placehold that will explain how to build an agile server goes here. diff --git a/debian/libzephyr4-krb5.templates b/debian/libzephyr4-krb5.templates new file mode 100644 index 0000000..cf97f10 --- /dev/null +++ b/debian/libzephyr4-krb5.templates @@ -0,0 +1,15 @@ +Template: libzephyr4-krb5/no-more-krb4 +Type: boolean +Default: true +Description: Potentially incompatible upgrade + You appear to be upgrading from a version of zephyr that uses + Kerberos version 4 to authenticate. Kerberos version 4 support has + been removed from Debian, and accordingly from zephyr. This version + of zephyr uses Kerberos 5 to authenticate, and thus your servers must + have been upgraded for it to be useful. + . + A server that authenticates both ways can be built for lenny from the + zephyr source package, see: + /usr/share/doc/libzephyr4-krb5/README.krb4-5 + . + Continue with the upgrade? diff --git a/debian/rules b/debian/rules index 1c1feef..6958031 100755 --- a/debian/rules +++ b/debian/rules @@ -128,11 +128,16 @@ binary-arch: build install dh_testdir dh_testroot set -e; \ - for file in files templates config postinst docs; do \ + for file in files templates postinst docs; do \ for dir in $(VARIETALS); do \ cp debian/zephyr-server.$$file debian/zephyr-server-$$dir.$$file; \ done; \ done + for file in config; do \ + for dir in $(filter-out krb5,$(VARIETALS)); do \ + cp debian/zephyr-server.$$file debian/zephyr-server-$$dir.$$file; \ + done; \ + done for file in README.Debian docs init postrm; do \ for dir in $(filter-out krb,$(VARIETALS)); do \ cp debian/zephyr-server-krb.$$file debian/zephyr-server-$$dir.$$file; \ diff --git a/debian/zephyr-server.templates b/debian/zephyr-server.templates index 11c9b86..efca03b 100644 --- a/debian/zephyr-server.templates +++ b/debian/zephyr-server.templates @@ -16,6 +16,23 @@ _Description: Zephyr servers: The list configured on clients can be a subset of the list configured on servers. +Template: zephyr-server/no-more-krb4 +Type: boolean +Default: true +Description: Incompatible Upgrade + You appear to be upgrading from a version of the zephyr server that + uses Kerberos version 4 to authenticate. Kerberos version 4 support + has been removed from Debian, and accordingly from the zephyr server. + This version of the zephyr server uses only Kerberos 5 to + authenticate, and thus is almost certainly incompatible with any of + your currently deployed clients. + . + A server that authenticates both ways can be built for lenny from the + zephyr source package, see: + /usr/share/doc/libzephyr4-krb5/README.krb4-5 + . + Continue with the upgrade? + Template: zephyr-server/read_conf Type: boolean Default: true -- cgit v1.2.3