Treat 0 time as unexpired for krb4 principals

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8973 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index ebb991c59b6e3bd3ee49c7ea8a8065bc4d13db03..ed2c4e5971cf39d4b037c4a3ddc81218e4f6d7da 100644 (file)
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug 23 14:17:42 1996  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in (install): Install in bin not sbin.
+
 Thu Aug 15 19:30:18 1996  Tom Yu  <tlyu@mit.edu>
 
        * 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 00b40ccdb8de71fc46d13877c0d3ae135274471c..d0a9b65fb1c3f79b13a69b54c52b90fd39c7c86d 100644 (file)
--- 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 06d8106d8352f09c9ee3f67ca66159a0d37fa148..3b394a9c46c382687ef4ec42283952c3bd4bce2f 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug 23 14:22:45 1996  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * kerberos_v4.c (check_princ): Assume an expiration date of zero means never expire.
+
 Thu Aug  1 11:13:46 1996  Ezra Peisach  <epeisach@dumpster.rose.brandeis.edu>
 
        * 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 e77ea31d945da0fcb795072cd7f655f77e178006..db074d9937737e50d0c961af42d9177386b17366 100644 (file)
--- 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,