aboutsummaryrefslogtreecommitdiff
path: root/src/kadmin/cli
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin/cli')
-rw-r--r--src/kadmin/cli/ChangeLog9
-rw-r--r--src/kadmin/cli/kadmin.c10
2 files changed, 11 insertions, 8 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index aa463ba..2c54a53 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-24 Ken Raeburn <raeburn@mit.edu>
+
+ * kadmin.c (strdate): Increase size of buffer to 40. Use sizeof
+ for length passed to strftime.
+
+2003-05-19 Sam Hartman <hartmans@mit.edu>
+
+ * kadmin.c (kadmin_startup): Don't register writable keytabs as this is always done by the library now.
+
2003-02-07 Tom Yu <tlyu@mit.edu>
* Makefile.in (install): Fix typo in k5srvutil.M install rule.
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 189938e..eb5468d 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -132,11 +132,11 @@ static char *strdate(when)
krb5_timestamp when;
{
struct tm *tm;
- static char out[30];
+ static char out[40];
time_t lcltim = when;
tm = localtime(&lcltim);
- strftime(out, 30, "%a %b %d %H:%M:%S %Z %Y", tm);
+ strftime(out, sizeof(out), "%a %b %d %H:%M:%S %Z %Y", tm);
return out;
}
@@ -175,7 +175,6 @@ char *kadmin_startup(argc, argv)
int argc;
char *argv[];
{
- extern krb5_kt_ops krb5_ktf_writable_ops;
extern char *optarg;
char *princstr = NULL, *keytab_name = NULL, *query = NULL;
char *password = NULL;
@@ -449,11 +448,6 @@ char *kadmin_startup(argc, argv)
}
/* register the WRFILE keytab type and set it as the default */
- if ((retval = krb5_kt_register(context, &krb5_ktf_writable_ops))) {
- com_err(whoami, retval,
- "while registering writable key table functions");
- exit(1);
- }
{
#define DEFAULT_KEYTAB "WRFILE:/etc/krb5.keytab"
/* XXX krb5_defkeyname is an internal library global and