You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2015/04/21 13:22:27 UTC
directory-kerby git commit: Fixing a bug with processing KerberosTime
Repository: directory-kerby
Updated Branches:
refs/heads/master a5dead553 -> 23ce24ea7
Fixing a bug with processing KerberosTime
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/23ce24ea
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/23ce24ea
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/23ce24ea
Branch: refs/heads/master
Commit: 23ce24ea7eaa40e765b1a1f4e98e188cd55d5e09
Parents: a5dead5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Apr 21 12:22:01 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Apr 21 12:22:01 2015 +0100
----------------------------------------------------------------------
.../apache/kerby/kerberos/kerb/server/request/KdcRequest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/23ce24ea/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
index 3d49af3..2165e17 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
@@ -370,7 +370,7 @@ public abstract class KdcRequest {
}
KerberosTime krbEndTime = request.getReqBody().getTill();
- if (krbEndTime == null) {
+ if (krbEndTime == null || krbEndTime.getTime() == 0) {
krbEndTime = krbStartTime.extend(config.getMaximumTicketLifetime() * 1000);
} else if (krbStartTime.greaterThan(krbEndTime)) {
throw new KrbException(KrbErrorCode.KDC_ERR_NEVER_VALID);
@@ -393,7 +393,7 @@ public abstract class KdcRequest {
ticketFlags.setFlag(TicketFlag.RENEWABLE);
- if (krbRtime == null) {
+ if (krbRtime == null || krbRtime.getTime() == 0) {
krbRtime = KerberosTime.NEVER;
}
KerberosTime allowedMaximumRenewableTime = krbStartTime;