directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dran...@apache.org
Subject [2/2] directory-kerby git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby
Date Wed, 24 Jun 2015 03:25:45 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4832ef6c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4832ef6c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4832ef6c

Branch: refs/heads/master
Commit: 4832ef6c97920c89220f22d3e7f1998733af07e5
Parents: 9425e8a 6f15357
Author: Drankye <drankye@gmail.com>
Authored: Wed Jun 24 11:25:10 2015 +0800
Committer: Drankye <drankye@gmail.com>
Committed: Wed Jun 24 11:25:10 2015 +0800

----------------------------------------------------------------------
 .../kerb/identity/backend/JsonBackendTest.java  | 11 +++++++++-
 .../kerby/kerberos/kerb/admin/KadminUtil.java   |  2 +-
 .../kerberos/kerb/crypto/CheckSumTest.java      | 21 ++++++++------------
 .../kerberos/kerb/crypto/CheckSumsTest.java     | 10 ++--------
 .../kerberos/kerb/crypto/FastUtilTest.java      |  2 --
 .../kerberos/kerb/crypto/KeyDeriveTest.java     |  4 +---
 .../kerby/kerberos/kerb/crypto/PrfTest.java     |  2 --
 .../kerberos/kerb/util/NewEncryptionTest.java   | 14 ++++++-------
 .../kerberos/provider/token/TokenTest.java      | 12 -----------
 9 files changed, 28 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4832ef6c/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/KadminUtil.java
----------------------------------------------------------------------
diff --cc kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/KadminUtil.java
index a6bbe77,63f545f..620ab0c
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/KadminUtil.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/KadminUtil.java
@@@ -112,18 -121,12 +112,18 @@@ public final class KadminUtil 
                  keytab = Keytab.loadKeytab(keytabFile);
              }
          } catch (IOException e) {
 -            throw new KrbException("Failed to load keytab", e);
 +            throw new KrbException("Failed to load or create keytab", e);
          }
  
 +        return keytab;
 +    }
 +
 +    static void exportToKeytab(Keytab keytab, KrbIdentity identity)
 +        throws KrbException {
 +
          //Add principal to keytab.
          PrincipalName principal = identity.getPrincipal();
-         KerberosTime timestamp = new KerberosTime();
+         KerberosTime timestamp = KerberosTime.now();
          for (EncryptionType encType : identity.getKeys().keySet()) {
              EncryptionKey ekey = identity.getKeys().get(encType);
              int keyVersion = ekey.getKvno();


Mime
View raw message