summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>1999-08-20 11:00:33 +0000
committerArtur Grabowski <art@cvs.openbsd.org>1999-08-20 11:00:33 +0000
commit007c3ef24e3313cf988fc15ed8c729977a7cb83a (patch)
treebfad65cf1c52b124a6d19aa23cbcba0724b84662
parent285e72d10c539be4e891cbc18f73407ff51337c1 (diff)
the default expiration date for new databases (Jan 1 04:59:59 2000) was not
optimal. The final (and safe) solution will come with kth-krb 0.10
-rw-r--r--kerberosIV/include/kerberosIV/site.h8
-rw-r--r--kerberosIV/kdb_init/kdb_init.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/kerberosIV/include/kerberosIV/site.h b/kerberosIV/include/kerberosIV/site.h
index 4af53a30172..31235f4ae86 100644
--- a/kerberosIV/include/kerberosIV/site.h
+++ b/kerberosIV/include/kerberosIV/site.h
@@ -1,4 +1,4 @@
-/* $Id: site.h,v 1.4 1997/12/15 17:56:16 art Exp $ */
+/* $OpenBSD: site.h,v 1.5 1999/08/20 11:00:32 art Exp $ */
/*
* Site-specific definitions.
@@ -26,6 +26,12 @@
/* the default syslog file */
#define KADM_SYSLOG "/var/log/admin_server.log"
+/* used by kdb_init.c */
+/* The default expire time for principals created by kadmind */
+/* The time "1104555599" gives a date of: Sat Jan 1 04:59:59 2005 */
+#define KDBINIT_EXPDATE 1104555599
+#define KDBINIT_EXPDATE_TXT "12/31/04"
+
#define DEFAULT_ACL_DIR "/etc/kerberosIV/"
/* These get appended to DEFAULT_ACL_DIR */
#define ADD_ACL_FILE "admin_acl.add"
diff --git a/kerberosIV/kdb_init/kdb_init.c b/kerberosIV/kdb_init/kdb_init.c
index 8c0c251e5ee..fe3eec833f0 100644
--- a/kerberosIV/kdb_init/kdb_init.c
+++ b/kerberosIV/kdb_init/kdb_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kdb_init.c,v 1.4 1998/02/18 11:53:50 art Exp $ */
+/* $OpenBSD: kdb_init.c,v 1.5 1999/08/20 11:00:32 art Exp $ */
/* $KTH: kdb_init.c,v 1.23 1997/03/30 17:45:05 assar Exp $ */
/*-
@@ -76,9 +76,9 @@ add_principal(char *name, char *instance, enum ap_op aap_op, int maxlife)
copy_from_key(new_key, &principal.key_low, &principal.key_high);
break;
}
- principal.exp_date = 946702799; /* Happy new century */
- strncpy(principal.exp_date_txt, "12/31/99", DATE_SZ);
principal.mod_date = time(0);
+ principal.exp_date = KDBINIT_EXPDATE;
+ strncpy(principal.exp_date_txt, KDBINIT_EXPDATE_TXT, DATE_SZ);
tm = k_localtime(&principal.mod_date);
principal.attributes = 0;