From: Björn Jacke Date: Mon, 16 Mar 2009 00:51:09 +0000 (+0100) Subject: fix build on old Heimdal based systems X-Git-Tag: build_3.3.2_ctdb_1~12 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=317ea0b90b5b15c89484c6308952d8506fcaccec;p=obnox%2Fsamba-ctdb.git fix build on old Heimdal based systems Signed-off-by: Günther Deschner (cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f) --- diff --git a/source/libads/krb5_errs.c b/source/libads/krb5_errs.c index 53023cc75a..0e03ebb90d 100644 --- a/source/libads/krb5_errs.c +++ b/source/libads/krb5_errs.c @@ -30,12 +30,10 @@ static const struct { {KRB5KDC_ERR_CLIENT_REVOKED, NT_STATUS_ACCESS_DENIED}, {KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME}, {KRB5KDC_ERR_ETYPE_NOSUPP, NT_STATUS_LOGON_FAILURE}, -#if defined(KRB5KDC_ERR_KEY_EXPIRED) /* Heimdal */ - {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED}, -#elif defined(KRB5KDC_ERR_KEY_EXP) /* MIT */ +#if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */ {KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED}, -#else -#error Neither KRB5KDC_ERR_KEY_EXPIRED nor KRB5KDC_ERR_KEY_EXP available +#else /* old Heimdal releases have it with different name only in an enum: */ + {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED}, #endif {25, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: bug in heimdal 0.7 krb5_get_init_creds_password (Inappropriate ioctl for device (25)) */ {KRB5KDC_ERR_NULL_KEY, NT_STATUS_LOGON_FAILURE},