From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 26 Jul 2011 11:28:08 +0000 (+0000)
Subject: Define KRB5_TL_DB_ARGS unconditionally in kdb.h
X-Git-Tag: krb5-1.10-alpha1~320
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f3f35c9f926597fb749f24c95fb9bf231f3b864;p=krb5.git

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.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25055 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/kdb.h b/src/include/kdb.h
index 93242ef87..b666225e6 100644
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -229,7 +229,6 @@ typedef struct __krb5_key_salt_tuple {
 #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 @@ typedef struct __krb5_key_salt_tuple {
 #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
 
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 9e8eef333..5240c2ff9 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -939,7 +939,6 @@ unlock_princ(kadm5_principal_ent_t princ, long *mask, const char *caller)
  * 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,
diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index 62d713936..b82bbcb40 100644
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -49,11 +49,6 @@
    other databases should set_err function to return string.  */
 #include "adb_err.h"
 
-/*
- * Type definitions
- */
-#define KRB5_TL_DB_ARGS                 0x7fff
-
 /*
  * internal static variable
  */
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
index 84ecb66dc..fcc1ebdb9 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
@@ -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>