svn rev #25055: trunk/src/ include/ kadmin/cli/ lib/kdb/ plugins/kdb/ldap/ldap_util/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25055
Commit By: ghudson
Log Message:
Define KRB5_TL_DB_ARGS unconditionally in kdb.h.

Due to an apparent merge bug, KRB5_TL_DB_ARGS was defined in a
SECURID conditional block, and several source files worked around the
problem by defining the constant themselves or defining SECURID.  Move
the definition and remove the workarounds.


Changed Files:
U   trunk/src/include/kdb.h
U   trunk/src/kadmin/cli/kadmin.c
U   trunk/src/lib/kdb/kdb5.c
U   trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
Modified: trunk/src/include/kdb.h
===================================================================
--- trunk/src/include/kdb.h	2011-07-26 10:46:50 UTC (rev 25054)
+++ trunk/src/include/kdb.h	2011-07-26 11:28:08 UTC (rev 25055)
@@ -229,7 +229,6 @@
 #define KRB5_TL_RB1_CHALLENGE           0x0005
 #ifdef SECURID
 #define KRB5_TL_SECURID_STATE           0x0006
-#define KRB5_TL_DB_ARGS                 0x7fff
 #endif /* SECURID */
 #define KRB5_TL_USER_CERTIFICATE        0x0007
 #define KRB5_TL_MKVNO                   0x0008
@@ -244,6 +243,8 @@
 #define KRB5_TL_X509_SUBJECT_ISSUER_NAME 0x0600 /* <I>IssuerDN<S>SubjectDN */
 #define KRB5_TL_LAST_ADMIN_UNLOCK       0x0700 /* Timestamp of admin unlock */
 
+#define KRB5_TL_DB_ARGS                 0x7fff
+
 /* version number for KRB5_TL_ACTKVNO data */
 #define KRB5_TL_ACTKVNO_VER     1
 

Modified: trunk/src/kadmin/cli/kadmin.c
===================================================================
--- trunk/src/kadmin/cli/kadmin.c	2011-07-26 10:46:50 UTC (rev 25054)
+++ trunk/src/kadmin/cli/kadmin.c	2011-07-26 11:28:08 UTC (rev 25055)
@@ -939,7 +939,6 @@
  * Parse addprinc or modprinc arguments.  Some output fields may be
  * filled in on error.
  */
-#define KRB5_TL_DB_ARGS 0x7fff
 static int
 kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
                         long *mask, char **pass, krb5_boolean *randkey,

Modified: trunk/src/lib/kdb/kdb5.c
===================================================================
--- trunk/src/lib/kdb/kdb5.c	2011-07-26 10:46:50 UTC (rev 25054)
+++ trunk/src/lib/kdb/kdb5.c	2011-07-26 11:28:08 UTC (rev 25055)
@@ -50,11 +50,6 @@
 #include "adb_err.h"
 
 /*
- * Type definitions
- */
-#define KRB5_TL_DB_ARGS                 0x7fff
-
-/*
  * internal static variable
  */
 

Modified: trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c	2011-07-26 10:46:50 UTC (rev 25054)
+++ trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c	2011-07-26 11:28:08 UTC (rev 25055)
@@ -81,9 +81,6 @@
  * Create / Modify / Destroy / View / List realm(s)
  */
 
-/* Needed for getting the definition of KRB5_TL_DB_ARGS */
-#define SECURID
-
 #include <stdio.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>