Changeset 223 for branches/samba-3.3.x/source/libads

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

Location:

branches/samba-3.3.x/source/libads

Files:

• kerberos.c (modified) (1 diff)
• krb5_errs.c (modified) (1 diff)

branches/samba-3.3.x/source/libads/kerberos.c

@@ -542 +542 @@
   out:
 
-        if (princ) {
-                krb5_free_principal(ctx, princ);
-        }
-        if (cc) {
-                krb5_cc_close(ctx, cc);
-        }
         if (ctx) {
+                if (princ) {
+                        krb5_free_principal(ctx, princ);
+                }
+                if (cc) {
+                        krb5_cc_close(ctx, cc);
+                }
                 krb5_free_context(ctx);
         }

branches/samba-3.3.x/source/libads/krb5_errs.c

@@ -31 +31 @@
         {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 */
+#if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
+        {KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
+#else /* old Heimdal releases have it with different name only in an enum: */
         {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
-#elif 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
 #endif
         {25, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: bug in heimdal 0.7 krb5_get_init_creds_password (Inappropriate ioctl for device (25)) */