From 1a2aac7d515d07af60d773d83e97296aac7670f2 Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Wed, 8 Jul 2009 12:07:16 +0800
Subject: [PATCH] 6857802: GSS getRemainingInitLifetime method returns
 milliseconds not seconds Reviewed-by: xuelei

---
 .../jgss/krb5/Krb5InitCredential.java         |  2 +-
 .../security/krb5/auto/LifeTimeInSeconds.java | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 test/sun/security/krb5/auto/LifeTimeInSeconds.java

diff --git a/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java b/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
index 1aac87223..4718f57e7 100644
--- a/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
+++ b/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
@@ -238,7 +238,7 @@ public class Krb5InitCredential
         retVal = (int)(getEndTime().getTime()
                        - (new Date().getTime()));
 
-        return retVal;
+        return retVal/1000;
     }
 
     /**
diff --git a/test/sun/security/krb5/auto/LifeTimeInSeconds.java b/test/sun/security/krb5/auto/LifeTimeInSeconds.java
new file mode 100644
index 000000000..2d20fc415
--- /dev/null
+++ b/test/sun/security/krb5/auto/LifeTimeInSeconds.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6857802
+ * @summary GSS getRemainingInitLifetime method returns milliseconds not seconds
+ */
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSManager;
+
+public class LifeTimeInSeconds {
+    public static void main(String[] args) throws Exception {
+        new OneKDC(null).writeJAASConf();
+        System.setProperty("javax.security.auth.useSubjectCredsOnly", "false");
+
+        GSSManager gm = GSSManager.getInstance();
+        GSSCredential cred = gm.createCredential(GSSCredential.INITIATE_AND_ACCEPT);
+        int time = cred.getRemainingLifetime();
+        int time2 = cred.getRemainingInitLifetime(null);
+        // The test KDC issues a TGT with a default lifetime of 11 hours
+        int elevenhrs = 11*3600;
+        if (time > elevenhrs+60 || time < elevenhrs-60) {
+            throw new Exception("getRemainingLifetime returns wrong value.");
+        }
+        if (time2 > elevenhrs+60 || time2 < elevenhrs-60) {
+            throw new Exception("getRemainingInitLifetime returns wrong value.");
+        }
+    }
+}
-- 
GitLab