summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-03-16 01:51:09 +0100
committerGünther Deschner <gd@samba.org>2009-03-19 14:47:48 +0100
commit011ad7245d53a716c4c766f5ef8d317bb3a53d0f (patch)
tree77fde4507df533d4e84fd1bf41baf53c991ef087
parent36e7045340bbc7d6567008bdd87c4cdf717835bd (diff)
downloadsamba-011ad7245d53a716c4c766f5ef8d317bb3a53d0f.tar.gz
samba-011ad7245d53a716c4c766f5ef8d317bb3a53d0f.tar.bz2
samba-011ad7245d53a716c4c766f5ef8d317bb3a53d0f.zip
fix build on old Heimdal based systems
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--source3/libads/krb5_errs.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/libads/krb5_errs.c b/source3/libads/krb5_errs.c
index 53023cc75a..0e03ebb90d 100644
--- a/source3/libads/krb5_errs.c
+++ b/source3/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},