directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject [25/29] directory-kerby git commit: Rename the templete conf file name.
Date Tue, 07 Jun 2016 02:23:11 GMT
Rename the templete conf file name.


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

Branch: refs/heads/kadmin-remote
Commit: 60357e37832ac86c93974fef4fb48dd469bb7d0a
Parents: 002b873
Author: plusplusjiajia <jiajia.li@intel.com>
Authored: Mon Jun 6 10:01:04 2016 +0800
Committer: plusplusjiajia <jiajia.li@intel.com>
Committed: Mon Jun 6 10:01:04 2016 +0800

----------------------------------------------------------------------
 .../kerby/kerberos/kerb/client/Krb5Conf.java    |  2 +-
 .../src/main/resources/krb5-template.conf       | 29 ++++++++++++++++++++
 .../kerb-simplekdc/src/main/resources/krb5.conf | 29 --------------------
 .../src/main/resources/krb5_udp-template.conf   | 29 ++++++++++++++++++++
 .../src/main/resources/krb5_udp.conf            | 29 --------------------
 5 files changed, 59 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60357e37/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
index dc47652..23fea52 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
@@ -49,7 +49,7 @@ public class Krb5Conf {
     private File generateConfFile() throws IOException {
         KdcSetting setting = kdcServer.getKdcSetting();
 
-        String resourcePath = setting.allowUdp() ? "/krb5_udp.conf" : "/krb5.conf";
+        String resourcePath = setting.allowUdp() ? "/krb5_udp-template.conf" : "/krb5-template.conf";
         InputStream templateResource = getClass().getResourceAsStream(resourcePath);
         String templateContent = IOUtil.readInput(templateResource);
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60357e37/kerby-kerb/kerb-simplekdc/src/main/resources/krb5-template.conf
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/resources/krb5-template.conf b/kerby-kerb/kerb-simplekdc/src/main/resources/krb5-template.conf
new file mode 100644
index 0000000..0954538
--- /dev/null
+++ b/kerby-kerb/kerb-simplekdc/src/main/resources/krb5-template.conf
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[libdefaults]
+    kdc_realm = _REALM_
+    default_realm = _REALM_
+    udp_preference_limit = _UDP_LIMIT_
+    #_KDC_TCP_PORT_
+    #_KDC_UDP_PORT_
+
+[realms]
+    _REALM_ = {
+        kdc = localhost:_KDC_PORT_
+    }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60357e37/kerby-kerb/kerb-simplekdc/src/main/resources/krb5.conf
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/resources/krb5.conf b/kerby-kerb/kerb-simplekdc/src/main/resources/krb5.conf
deleted file mode 100644
index 0954538..0000000
--- a/kerby-kerb/kerb-simplekdc/src/main/resources/krb5.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-[libdefaults]
-    kdc_realm = _REALM_
-    default_realm = _REALM_
-    udp_preference_limit = _UDP_LIMIT_
-    #_KDC_TCP_PORT_
-    #_KDC_UDP_PORT_
-
-[realms]
-    _REALM_ = {
-        kdc = localhost:_KDC_PORT_
-    }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60357e37/kerby-kerb/kerb-simplekdc/src/main/resources/krb5_udp-template.conf
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/resources/krb5_udp-template.conf b/kerby-kerb/kerb-simplekdc/src/main/resources/krb5_udp-template.conf
new file mode 100644
index 0000000..0954538
--- /dev/null
+++ b/kerby-kerb/kerb-simplekdc/src/main/resources/krb5_udp-template.conf
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[libdefaults]
+    kdc_realm = _REALM_
+    default_realm = _REALM_
+    udp_preference_limit = _UDP_LIMIT_
+    #_KDC_TCP_PORT_
+    #_KDC_UDP_PORT_
+
+[realms]
+    _REALM_ = {
+        kdc = localhost:_KDC_PORT_
+    }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/60357e37/kerby-kerb/kerb-simplekdc/src/main/resources/krb5_udp.conf
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/resources/krb5_udp.conf b/kerby-kerb/kerb-simplekdc/src/main/resources/krb5_udp.conf
deleted file mode 100644
index 0954538..0000000
--- a/kerby-kerb/kerb-simplekdc/src/main/resources/krb5_udp.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-[libdefaults]
-    kdc_realm = _REALM_
-    default_realm = _REALM_
-    udp_preference_limit = _UDP_LIMIT_
-    #_KDC_TCP_PORT_
-    #_KDC_UDP_PORT_
-
-[realms]
-    _REALM_ = {
-        kdc = localhost:_KDC_PORT_
-    }
\ No newline at end of file


Mime
View raw message