[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-535-g3b74ba9

[Günther Deschner]

The branch, v3-4-test has been updated
       via  3b74ba990e5b96e17ef76845551ab03fdddc59f8 (commit)
      from  5bbf96dd63227a19fe1f95ff8d8f2b3c75a5a497 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 3b74ba990e5b96e17ef76845551ab03fdddc59f8
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Mar 16 01:51:09 2009 +0100

    fix build on old Heimdal based systems
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f)

-----------------------------------------------------------------------

Summary of changes:
 source3/libads/krb5_errs.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/krb5_errs.c b/source3/libads/krb5_errs.c
index 53023cc..0e03ebb 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},


-- 
Samba Shared Repository