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/kadmin/cli | |
| 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/kadmin/cli')
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, |