diff options
| author | Björn Jacke <bj@sernet.de> | 2009-03-16 01:51:09 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-03-27 13:06:54 +0100 |
| commit | 6d743ddcaf9876f5f43feb402c782ea7a47ee411 (patch) | |
| tree | c1e19cd70cf42156e70dd9c29e5ca941afc482b9 | |
| parent | af87220d07ba0c558443d4d69351a7f5bab5546e (diff) | |
| download | samba-6d743ddcaf9876f5f43feb402c782ea7a47ee411.tar.gz samba-6d743ddcaf9876f5f43feb402c782ea7a47ee411.tar.xz samba-6d743ddcaf9876f5f43feb402c782ea7a47ee411.zip | |
fix build on old Heimdal based systems
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f)
(cherry picked from commit 5eaa2541f19277bc00c47b944739c6732f90809b)
| -rw-r--r-- | source/libads/krb5_errs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/libads/krb5_errs.c b/source/libads/krb5_errs.c index 53023cc75a5..0e03ebb90dd 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}, |