You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/11/05 08:08:24 UTC
[1/5] directory-kerby git commit: fix json backend problem that a new
json backend database file will be created when new identities added
Repository: directory-kerby
Updated Branches:
refs/heads/pkinit-support 4e7a3c0cf -> 87a9f55cf
fix json backend problem that a new json backend database file will be created when new identities added
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/df2539be
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/df2539be
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/df2539be
Branch: refs/heads/pkinit-support
Commit: df2539bed1b4fc59642979ade83abfd8809b53bd
Parents: ed68699
Author: yaningxu <ya...@gmail.com>
Authored: Wed Nov 4 18:29:18 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Wed Nov 4 18:29:18 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/df2539be/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
index 6139ef3..18a75c4 100644
--- a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
+++ b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
@@ -263,10 +263,7 @@ public class JsonIdentityBackend extends AbstractIdentityBackend {
private void persistToFile() throws KrbException {
String newJsonContent = gson.toJson(identities);
try {
- File newJsonKdbFile = File.createTempFile("kerby-kdb",
- ".json", jsonKdbFile.getParentFile());
- IOUtil.writeFile(newJsonContent, newJsonKdbFile);
- newJsonKdbFile.renameTo(jsonKdbFile);
+ IOUtil.writeFile(newJsonContent, jsonKdbFile);
kdbFileUpdateTime = jsonKdbFile.lastModified();
} catch (IOException e) {
LOG.error("Error occurred while writing identities to file: " + jsonKdbFile);
[5/5] directory-kerby git commit: Merge remote-tracking branch
'asf/master' into pkinit-support
Posted by pl...@apache.org.
Merge remote-tracking branch 'asf/master' into pkinit-support
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/87a9f55c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/87a9f55c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/87a9f55c
Branch: refs/heads/pkinit-support
Commit: 87a9f55cfa21fc373e21f29f73630940b7178bef
Parents: 4e7a3c0 0295395
Author: plusplusjiajia <ji...@intel.com>
Authored: Thu Nov 5 15:14:31 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Thu Nov 5 15:14:31 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java | 1 +
kerby-kerb/kerb-client-api-all/pom.xml | 1 +
kerby-kerb/kerb-server-api-all/pom.xml | 1 +
kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java | 2 ++
4 files changed, 5 insertions(+)
----------------------------------------------------------------------
[4/5] directory-kerby git commit: DIRKRB-447 Fix multiple SLF4J
bindings.
Posted by pl...@apache.org.
DIRKRB-447 Fix multiple SLF4J bindings.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/0295395a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/0295395a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/0295395a
Branch: refs/heads/pkinit-support
Commit: 0295395ae9f3073831c9860b34cfb931e17a0687
Parents: 2daee23
Author: plusplusjiajia <ji...@intel.com>
Authored: Thu Nov 5 15:11:27 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Thu Nov 5 15:11:27 2015 +0800
----------------------------------------------------------------------
kerby-kerb/kerb-client-api-all/pom.xml | 1 +
kerby-kerb/kerb-server-api-all/pom.xml | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0295395a/kerby-kerb/kerb-client-api-all/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client-api-all/pom.xml b/kerby-kerb/kerb-client-api-all/pom.xml
index 41fb292..2649d5a 100644
--- a/kerby-kerb/kerb-client-api-all/pom.xml
+++ b/kerby-kerb/kerb-client-api-all/pom.xml
@@ -54,6 +54,7 @@
<excludes>
<exclude>junit:junit</exclude>
<exclude>org.slf4j:slf4j-api</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>org.apache.kerby:kerby-asn1</exclude>
</excludes>
</artifactSet>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0295395a/kerby-kerb/kerb-server-api-all/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server-api-all/pom.xml b/kerby-kerb/kerb-server-api-all/pom.xml
index fccc515..25ecf24 100644
--- a/kerby-kerb/kerb-server-api-all/pom.xml
+++ b/kerby-kerb/kerb-server-api-all/pom.xml
@@ -59,6 +59,7 @@
<excludes>
<exclude>junit:junit</exclude>
<exclude>org.slf4j:slf4j-api</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>org.apache.kerby:kerby-asn1</exclude>
</excludes>
</artifactSet>
[2/5] directory-kerby git commit: refine persistTofile() method in
JsonIdentityBackend.java and close the FileInputStream after used in
IOUtil.java
Posted by pl...@apache.org.
refine persistTofile() method in JsonIdentityBackend.java and close the FileInputStream after used in IOUtil.java
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/44f40d11
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/44f40d11
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/44f40d11
Branch: refs/heads/pkinit-support
Commit: 44f40d11d8cf2d9017278d92aec5d9f48d3fb88d
Parents: ed68699
Author: yaningxu <ya...@gmail.com>
Authored: Thu Nov 5 14:02:51 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Thu Nov 5 14:02:51 2015 +0800
----------------------------------------------------------------------
.../kdc/identitybackend/JsonIdentityBackend.java | 1 +
kerby-dist/kdc-dist/conf/admin.keytab | Bin 0 -> 148 bytes
.../src/main/java/org/apache/kerby/util/IOUtil.java | 2 ++
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/44f40d11/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
index 6139ef3..cc1da07 100644
--- a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
+++ b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
@@ -266,6 +266,7 @@ public class JsonIdentityBackend extends AbstractIdentityBackend {
File newJsonKdbFile = File.createTempFile("kerby-kdb",
".json", jsonKdbFile.getParentFile());
IOUtil.writeFile(newJsonContent, newJsonKdbFile);
+ jsonKdbFile.delete();
newJsonKdbFile.renameTo(jsonKdbFile);
kdbFileUpdateTime = jsonKdbFile.lastModified();
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/44f40d11/kerby-dist/kdc-dist/conf/admin.keytab
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/conf/admin.keytab b/kerby-dist/kdc-dist/conf/admin.keytab
new file mode 100644
index 0000000..9c3942b
Binary files /dev/null and b/kerby-dist/kdc-dist/conf/admin.keytab differ
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/44f40d11/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java b/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
index 30bf3ed..9a5cf96 100644
--- a/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
+++ b/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
@@ -41,6 +41,7 @@ public final class IOUtil {
while ((length = in.read(buffer)) != -1) {
baos.write(buffer, 0, length);
}
+ in.close();
return baos.toByteArray();
}
@@ -56,6 +57,7 @@ public final class IOUtil {
toRead -= ret;
off += ret;
}
+ in.close();
}
/**
[3/5] directory-kerby git commit: refine persistTofile() method in
JsonIdentityBackend.java and close the FileInputStream after used in
IOUtil.java
Posted by pl...@apache.org.
refine persistTofile() method in JsonIdentityBackend.java and close the FileInputStream after used in IOUtil.java
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/2daee238
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/2daee238
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/2daee238
Branch: refs/heads/pkinit-support
Commit: 2daee238dbcf01170a01936f0feddb65e7dd0726
Parents: df2539b 44f40d1
Author: yaningxu <ya...@gmail.com>
Authored: Thu Nov 5 14:09:51 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Thu Nov 5 14:09:51 2015 +0800
----------------------------------------------------------------------
.../kerberos/kdc/identitybackend/JsonIdentityBackend.java | 6 +++++-
kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------