From: Tom Yu <tlyu@mit.edu>
Date: Thu, 4 Jan 2007 00:27:26 +0000 (+0000)
Subject: pull up r19031 from trunk
X-Git-Tag: krb5-1.6-final~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7a05762634afb75bde63104f591e8cfcd452960f;p=krb5.git

pull up r19031 from trunk

 r19031@cathode-dark-space:  raeburn | 2007-01-03 18:54:25 -0500
 ticket: 5260

 * ldap_principal.c (attributes_set): Swap first two elements.

 Also add comments indicating that this array and the KDB_*_ATTR macros
 need to be in sync.


ticket: 5260
version_fixed: 1.6

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19034 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
index 83ba05d4a..77256482e 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
@@ -65,8 +65,9 @@ char     *principal_attributes[] = { "krbprincipalname",
 				     "krbObjectReferences",
 				     NULL };
 
-static char *attributes_set[] = { "krbmaxrenewableage",
-				  "krbmaxticketlife",
+/* Must match KDB_*_ATTR macros in ldap_principal.h.  */
+static char *attributes_set[] = { "krbmaxticketlife",
+				  "krbmaxrenewableage",
 				  "krbticketflags",
 				  "krbprincipalexpiration",
 				  "krbticketpolicyreference",
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h
index e932e253e..ca8c80681 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h
@@ -66,6 +66,7 @@
 /* these will be consumed only by krb5_ldap_delete_principal*/
 /* these will be set by krb5_ldap_get_principal and fed into the tl_data */
 
+/* See also attributes_set[] in ldap_principal.c.  */
 #define KDB_MAX_LIFE_ATTR                    0x000001
 #define KDB_MAX_RLIFE_ATTR                   0x000002
 #define KDB_TKT_FLAGS_ATTR                   0x000004