diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-07-26 11:28:08 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-07-26 11:28:08 +0000 |
| commit | 4f3f35c9f926597fb749f24c95fb9bf231f3b864 (patch) | |
| tree | 02797a0ebeef19bf1547b8e0c26c7ce7d47049bc /src/include/kdb.h | |
| parent | 32ffc4505e6334d8bcd287e89b88f35d9d9f2539 (diff) | |
| download | krb5-4f3f35c9f926597fb749f24c95fb9bf231f3b864.tar.gz krb5-4f3f35c9f926597fb749f24c95fb9bf231f3b864.tar.xz krb5-4f3f35c9f926597fb749f24c95fb9bf231f3b864.zip | |
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
Diffstat (limited to 'src/include/kdb.h')
| -rw-r--r-- | src/include/kdb.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 |