summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2007-01-03 23:54:25 +0000
committerKen Raeburn <raeburn@mit.edu>2007-01-03 23:54:25 +0000
commit730ed7029f9e4355e0c72ed653dabb46ccbc3026 (patch)
tree49425039c4da0079674dd137ba69f8d3785f107f /src/plugins
parent3cfb92cf2238be27c379e3d5ac16cd517244d235 (diff)
downloadkrb5-730ed7029f9e4355e0c72ed653dabb46ccbc3026.tar.gz
krb5-730ed7029f9e4355e0c72ed653dabb46ccbc3026.tar.xz
krb5-730ed7029f9e4355e0c72ed653dabb46ccbc3026.zip
* 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 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19031 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c5
-rw-r--r--src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h1
2 files changed, 4 insertions, 2 deletions
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