From b13adbab39f75cff955fc1ca90f935918d130295 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Fri, 23 Aug 1996 19:00:50 +0000 Subject: [PATCH] Treat 0 time as unexpired for krb4 principals git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8973 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/passwd/ChangeLog | 4 ++++ src/kadmin/passwd/Makefile.in | 2 +- src/kdc/ChangeLog | 4 ++++ src/kdc/kerberos_v4.c | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog index ebb991c59..ed2c4e597 100644 --- a/src/kadmin/passwd/ChangeLog +++ b/src/kadmin/passwd/ChangeLog @@ -1,3 +1,7 @@ +Fri Aug 23 14:17:42 1996 Sam Hartman + + * Makefile.in (install): Install in bin not sbin. + Thu Aug 15 19:30:18 1996 Tom Yu * configure.in: Add USE_KDB5_LIBRARY to pick up -ldb. Recent diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in index 00b40ccdb..d0a9b65fb 100644 --- a/src/kadmin/passwd/Makefile.in +++ b/src/kadmin/passwd/Makefile.in @@ -13,7 +13,7 @@ $(PROG): $(OBJS) $(CLNTDEPLIBS) $(CC) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(CLNTLIBS) install:: - $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) + $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(BINDIR)/$(PROG) clean:: $(RM) kpasswd_strings.c kpasswd_strings.h $(PROG) $(OBJS) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 06d8106d8..3b394a9c4 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,7 @@ +Fri Aug 23 14:22:45 1996 Sam Hartman + + * kerberos_v4.c (check_princ): Assume an expiration date of zero means never expire. + Thu Aug 1 11:13:46 1996 Ezra Peisach * configure.in (withval): Link -ldyn as it is needed by the kadm5 diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c index e77ea31d9..db074d993 100644 --- a/src/kdc/kerberos_v4.c +++ b/src/kdc/kerberos_v4.c @@ -925,7 +925,8 @@ int check_princ(p_name, instance, lifetime, p) return KERB_ERR_NULL_KEY; } /* make sure the service hasn't expired */ - if ((u_long) p->exp_date < (u_long) kerb_time.tv_sec) { + if (((u_long) p->exp_date != 0)&& + ((u_long) p->exp_date <(u_long) kerb_time.tv_sec)) { /* service did expire, log it */ lt = klog(L_ERR_SEXP, "EXPIRED \"%s\" \"%s\" %s", p->name, p->instance, -- 2.26.2