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
#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
#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
* 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,
other databases should set_err function to return string. */
#include "adb_err.h"
-/*
- * Type definitions
- */
-#define KRB5_TL_DB_ARGS 0x7fff
-
/*
* internal static variable
*/
* 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>