Hello community,
here is the log from the commit of package yast2-kerberos-client
checked in at Fri Feb 23 12:11:39 CET 2007.
--------
--- yast2-kerberos-client/yast2-kerberos-client.changes 2007-02-16 16:13:07.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-kerberos-client/yast2-kerberos-client.changes 2007-02-20 13:28:39.078924000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 20 13:15:44 CET 2007 - jsuchome@suse.cz
+
+- support multiple values for KDC (#246241)
+- 2.15.3
+
+-------------------------------------------------------------------
Old:
----
yast2-kerberos-client-2.15.2.tar.bz2
New:
----
yast2-kerberos-client-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-kerberos-client.spec ++++++
--- /var/tmp/diff_new_pack.g17172/_old 2007-02-23 12:11:10.000000000 +0100
+++ /var/tmp/diff_new_pack.g17172/_new 2007-02-23 12:11:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-kerberos-client (Version 2.15.2)
+# spec file for package yast2-kerberos-client (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-kerberos-client
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-kerberos-client-2.15.2.tar.bz2
+Source0: yast2-kerberos-client-2.15.3.tar.bz2
prefix: /usr
BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite
# new Pam.ycp API
@@ -35,7 +35,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-kerberos-client-2.15.2
+%setup -n yast2-kerberos-client-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,9 @@
%doc %{prefix}/share/doc/packages/yast2-kerberos-client
%changelog
+* Tue Feb 20 2007 - jsuchome@suse.cz
+- support multiple values for KDC (#246241)
+- 2.15.3
* Fri Feb 16 2007 - jsuchome@suse.cz
- install required packages at the end of configuration (#233160)
- 2.15.2
++++++ yast2-kerberos-client-2.15.2.tar.bz2 -> yast2-kerberos-client-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/agents/etc_krb5_conf.scr new/yast2-kerberos-client-2.15.3/agents/etc_krb5_conf.scr
--- old/yast2-kerberos-client-2.15.2/agents/etc_krb5_conf.scr 2005-09-08 10:36:16.000000000 +0200
+++ new/yast2-kerberos-client-2.15.3/agents/etc_krb5_conf.scr 2007-02-19 16:39:30.000000000 +0100
@@ -15,7 +15,7 @@
`IniAgent(
"/etc/krb5.conf",
$[
- "options" : [ "global_values" ],
+ "options" : [ "global_values", "repeat_names" ],
"comments": [ "^[ \t]*#.*", "#.*", "^[ \t]*$" ],
"sections" : [
$[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/src/dialogs.ycp new/yast2-kerberos-client-2.15.3/src/dialogs.ycp
--- old/yast2-kerberos-client-2.15.2/src/dialogs.ycp 2007-02-16 14:10:42.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/src/dialogs.ycp 2007-02-20 13:01:54.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel
*
- * $Id: dialogs.ycp 35336 2007-01-15 10:13:24Z jsuchome $
+ * $Id: dialogs.ycp 36225 2007-02-16 15:13:34Z jsuchome $
*/
{
@@ -95,8 +95,7 @@
// help text 2/5
_("<p>
<b>Basic Client Settings</b>:
-Enter your <b>Default Domain</b>, <b>Default Realm</b>, and the host name or address of your Key Distribution Center (<b>KDC Server Address</b>).</p>
-") +
+Enter your <b>Default Domain</b>, <b>Default Realm</b>, and the hostname or address of your Key Distribution Center (<b>KDC Server Address</b>). To specify more values for KDC, separate them by spaces.</p>") +
// help text 3/5
_("<p>
@@ -190,14 +189,22 @@
result = `not_next;
continue;
}
- if (use_pam_krb && !check_address (kdc))
+ if (use_pam_krb)
{
- // error popup label
- Report::Error (_("The KDC server address is invalid.") +
- "\n\n" + Address::Valid4 ());
- UI::SetFocus (`id(`kdc));
- result = `not_next;
- continue;
+ list<string> kdcs = splitstring (kdc, " \t");
+ boolean checked = true;
+ foreach (string k, kdcs, {
+ checked = checked && check_address (k);
+ });
+ if (!checked)
+ {
+ // error popup label
+ Report::Error (_("The KDC server address is invalid.") +
+ "\n\n" + Address::Valid4 ());
+ UI::SetFocus (`id(`kdc));
+ result = `not_next;
+ continue;
+ }
}
}
if ((result == `abort || result == `cancel) &&
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/src/kerberos.ycp new/yast2-kerberos-client-2.15.3/src/kerberos.ycp
--- old/yast2-kerberos-client-2.15.2/src/kerberos.ycp 2007-02-16 13:59:02.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/src/kerberos.ycp 2007-02-16 16:13:39.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Jiri Suchomel
*
- * $Id: kerberos.ycp 34387 2006-11-14 15:15:42Z jsuchome $
+ * $Id: kerberos.ycp 36225 2007-02-16 15:13:34Z jsuchome $
*
* Main file for kerberos-client configuration. Uses all other files.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/src/Kerberos.ycp new/yast2-kerberos-client-2.15.3/src/Kerberos.ycp
--- old/yast2-kerberos-client-2.15.2/src/Kerberos.ycp 2007-01-12 13:38:57.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/src/Kerberos.ycp 2007-02-20 13:12:39.000000000 +0100
@@ -159,35 +159,92 @@
}
/**
+ * Reads the item values from the /etc/krb5.conf via ini agent
+ * If the item doesn't exist, returns the default value
+ * @param path_to_value path for agent (.etc.krb5_conf)
+ * @param def_value default value for the key (path)
+ * @return list string the values for given key
+ */
+global list<string> ReadKrb5ConfValues (path path_to_value, string def_value) ``{
+
+ list<string> value = (list<string>) SCR::Read (path_to_value);
+ if (value == nil)
+ value = [def_value];
+ return value;
+}
+
+/**
* Reads the item value from the /etc/krb5.conf via ini agent
- * If the item doesn't exist, returns empty string (not nil)
+ * If the item doesn't exist, returns the default value
* @param path_to_value path for agent (.etc.krb5_conf)
+ * @param def_value default value for the key (path)
* @return string the value
*/
-global define string ReadFile (path path_to_value, string def_value) ``{
+global string ReadKrb5ConfValue (path path_to_value, string def_value) {
- string value = (string) SCR::Read (path_to_value);
- if (value == nil)
- value = def_value;
+ list vals = ReadKrb5ConfValues (path_to_value, def_value);
+ return vals[0]:def_value;
+}
- return value;
+/**
+ * Deprecated variant to ReadKrb5ConfValue
+ * @deprecated
+ */
+global string ReadFile (path path_to_value, string def_value) {
+
+ y2warning ("This function is deprecated, use ReadKrb5ConfValue instead.");
+ return ReadKrb5ConfValue (path_to_value, def_value);
+}
+
+/**
+ * Write list of values for given key to /etc/krb5.conf
+ * Do not write anything for empty and nil values
+ * @param path_to_value path for agent (.etc.krb5_conf)
+ * @param value
+ * @return false when nothing was written, success of write otherwise
+ */
+global boolean WriteKrb5ConfValues (path path_to_value, list<string> values) {
+
+ if (values == nil || values == [])
+ return false;
+ return SCR::Write (path_to_value, values);
}
/**
+ * Write (possible) multiple values of given key to /etc/krb5.conf
+ * @param values values separated by spaces
+ */
+global boolean WriteKrb5ConfValuesAsString (path path_to_value, string values) {
+
+ return WriteKrb5ConfValues (path_to_value,
+ filter (string val, splitstring (values, " \t"), ``(val != "")));
+}
+/**
* Write the item value to /etc/krb5.conf
* Do not write anything for empty and nil values
* @param path_to_value path for agent (.etc.krb5_conf)
* @param value
* @return false when nothing was written, success of write otherwise
*/
-global define boolean WriteFile (path path_to_value, string value) {
+global boolean WriteKrb5ConfValue (path path_to_value, string value) {
if (value == nil || value == "")
return false;
+ return WriteKrb5ConfValues (path_to_value, [value]);
+}
- return SCR::Write (path_to_value, value);
+/**
+ * Deprecated variant to WriteKrb5ConfValue
+ * @deprecated
+ */
+global define boolean WriteFile (path path_to_value, string value) {
+
+ y2warning ("This function is deprecated, use WriteKrb5ConfValue instead.");
+ return WriteKrb5ConfValue (path_to_value, value);
}
+
+
/**
* Reads Kerberos settings from the SCR
* @return success
@@ -201,29 +258,29 @@
{
y2debug("krb5.conf sections: %1", SCR::Dir(.etc.krb5_conf.s));
- default_realm = ReadFile(.etc.krb5_conf.v.libdefaults.default_realm,"");
+ default_realm = ReadKrb5ConfValue(.etc.krb5_conf.v.libdefaults.default_realm,"");
- clockskew = ReadFile (.etc.krb5_conf.v.libdefaults.clockskew, "300");
+ clockskew = ReadKrb5ConfValue (.etc.krb5_conf.v.libdefaults.clockskew, "300");
if (size (default_realm) > 0)
{
path realm = add (.etc.krb5_conf.v, default_realm);
- kdc = ReadFile (add (realm, "kdc"),"");
- admin_server = ReadFile (add (realm, "admin_server"),"");
- default_domain = ReadFile (add (realm,"default_domain"), "");
+ kdc = mergestring (ReadKrb5ConfValues (add (realm, "kdc"),""), " ");
+ admin_server = mergestring (ReadKrb5ConfValues(add (realm, "admin_server"),""), " ");
+ default_domain = ReadKrb5ConfValue (add (realm,"default_domain"), "");
}
if (admin_server == kdc)
admin_server = ""; // we could replace it in Write in this case...
- ticket_lifetime = ReadFile (.etc.krb5_conf.v.pam.ticket_lifetime, "1d");
- renew_lifetime = ReadFile (.etc.krb5_conf.v.pam.renew_lifetime, "1d");
- forwardable = ReadFile (.etc.krb5_conf.v.pam.forwardable, "true");
- proxiable = ReadFile (.etc.krb5_conf.v.pam.proxiable, "false");
- retain_after_close = ReadFile (.etc.krb5_conf.v.pam.retain_after_close,
+ ticket_lifetime = ReadKrb5ConfValue (.etc.krb5_conf.v.pam.ticket_lifetime, "1d");
+ renew_lifetime = ReadKrb5ConfValue (.etc.krb5_conf.v.pam.renew_lifetime, "1d");
+ forwardable = ReadKrb5ConfValue (.etc.krb5_conf.v.pam.forwardable, "true");
+ proxiable = ReadKrb5ConfValue (.etc.krb5_conf.v.pam.proxiable, "false");
+ retain_after_close = ReadKrb5ConfValue (.etc.krb5_conf.v.pam.retain_after_close,
"false");
- minimum_uid = ReadFile (.etc.krb5_conf.v.pam.minimum_uid, "1");
- use_shmem = ReadFile (.etc.krb5_conf.v.pam.use_shmem, "sshd");
+ minimum_uid = ReadKrb5ConfValue (.etc.krb5_conf.v.pam.minimum_uid, "1");
+ use_shmem = ReadKrb5ConfValue (.etc.krb5_conf.v.pam.use_shmem, "sshd");
}
else
SCR::Execute (.target.bash, sformat("/usr/bin/touch /etc/krb5.conf"));
@@ -367,7 +424,7 @@
if (modified)
{
// change the default realm name
- WriteFile (.etc.krb5_conf.v.libdefaults.default_realm, default_realm);
+ WriteKrb5ConfValue (.etc.krb5_conf.v.libdefaults.default_realm, default_realm);
// write the mapping domain-realm
if (default_domain != "")
@@ -375,20 +432,20 @@
string domain = default_domain;
if ( findfirstof (domain, ".") != 0)
domain = "." + domain;
- WriteFile (add(.etc.krb5_conf.v.domain_realm,domain),default_realm);
+ WriteKrb5ConfValue (add(.etc.krb5_conf.v.domain_realm,domain),default_realm);
}
- WriteFile (.etc.krb5_conf.v.libdefaults.clockskew, clockskew);
+ WriteKrb5ConfValue (.etc.krb5_conf.v.libdefaults.clockskew, clockskew);
if (contains (SCR::Dir(.etc.krb5_conf.s), default_realm))
{
// update the default realm settings
- WriteFile (add (add (.etc.krb5_conf.v, default_realm),"kdc"),kdc);
- WriteFile (add (add (.etc.krb5_conf.v, default_realm),
+ WriteKrb5ConfValuesAsString (add (add (.etc.krb5_conf.v, default_realm),"kdc"),kdc);
+ WriteKrb5ConfValue (add (add (.etc.krb5_conf.v, default_realm),
"default_domain"), default_domain);
if (admin_server == "")
// save only when the entry was mising or same as KDC
- WriteFile (add (add (.etc.krb5_conf.v, default_realm),
+ WriteKrb5ConfValuesAsString (add (add (.etc.krb5_conf.v, default_realm),
"admin_server"),kdc);
}
else if (default_realm != "")
@@ -396,12 +453,12 @@
// specify the type of this subsection
SCR::Write( add (.etc.krb5_conf.st.realms, default_realm), 1);
// write the settings of the new default realm
- WriteFile (
+ WriteKrb5ConfValuesAsString (
add (add(.etc.krb5_conf.v.realms,default_realm),"kdc"), kdc);
- WriteFile (add (add (.etc.krb5_conf.v.realms, default_realm),
+ WriteKrb5ConfValue (add (add (.etc.krb5_conf.v.realms, default_realm),
"default_domain"), default_domain);
if (admin_server == "")
- WriteFile(add (add (.etc.krb5_conf.v.realms, default_realm),
+ WriteKrb5ConfValuesAsString (add (add (.etc.krb5_conf.v.realms, default_realm),
"admin_server"), kdc);
}
@@ -414,13 +471,13 @@
pam_sect = .etc.krb5_conf.v.appdefaults.pam;
}
- WriteFile (add (pam_sect, "ticket_lifetime"), ticket_lifetime);
- WriteFile (add (pam_sect, "renew_lifetime"), renew_lifetime);
- WriteFile (add (pam_sect, "forwardable"), forwardable);
- WriteFile (add (pam_sect, "proxiable"), proxiable);
- WriteFile (add (pam_sect, "retain_after_close"), retain_after_close);
- WriteFile (add (pam_sect, "minimum_uid"), minimum_uid);
- WriteFile (add (pam_sect, "use_shmem"), use_shmem);
+ WriteKrb5ConfValue (add (pam_sect, "ticket_lifetime"), ticket_lifetime);
+ WriteKrb5ConfValue (add (pam_sect, "renew_lifetime"), renew_lifetime);
+ WriteKrb5ConfValue (add (pam_sect, "forwardable"), forwardable);
+ WriteKrb5ConfValue (add (pam_sect, "proxiable"), proxiable);
+ WriteKrb5ConfValue (add (pam_sect, "retain_after_close"), retain_after_close);
+ WriteKrb5ConfValue (add (pam_sect, "minimum_uid"), minimum_uid);
+ WriteKrb5ConfValue (add (pam_sect, "use_shmem"), use_shmem);
// write the changes now
SCR::Write (.etc.krb5_conf, nil);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/ReadFile.out new/yast2-kerberos-client-2.15.3/testsuite/tests/ReadFile.out
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/ReadFile.out 2005-09-08 10:36:17.000000000 +0200
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/ReadFile.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-Read .etc.krb5_conf.v.libdefaults.default_realm "SUSE.CZ"
-Return SUSE.CZ
-Read .etc.krb5_conf.v."SUSE.CZ"."kdc" "chimera.suse.cz"
-Return chimera.suse.cz
-Read .etc.krb5_conf.v."SUSE.DE"."kdc" nil
-Return test.suse.de
-Read .etc.krb5_conf.v.pam.ticket_lifetime nil
-Return 1d
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/ReadFile.ycp new/yast2-kerberos-client-2.15.3/testsuite/tests/ReadFile.ycp
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/ReadFile.ycp 2005-09-08 10:36:17.000000000 +0200
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/ReadFile.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-/**
- * ReadFile.ycp
- * Test of Kerberos::ReadFile function
- * Author: Jiri Suchomel
- * $Id: ReadFile.ycp 21833 2005-02-22 13:51:43Z jsuchome $
- */
-
-{
- // testedfiles: Kerberos.ycp
- import "Testsuite";
- import "Kerberos";
-
- map READ = $[
- "etc": $[
- // /etc/krb5.conf
- "krb5_conf" : $[
- "v" : $[
- "libdefaults": $[
- "default_realm": "SUSE.CZ",
- "clockskew": "500"
- ],
- "SUSE.CZ": $[
- "kdc": "chimera.suse.cz",
- "default_domain": nil,
- ],
- "pam" : $[
- "ticket_lifetime": nil,
- ],
- "SUSE.DE": nil
- ],
- ],
- ]
- ];
-
- path p = .etc.krb5_conf.v.libdefaults.default_realm;
-
- string realm = (string)Testsuite::Test(``(Kerberos::ReadFile (p, "")), [ READ, $[], $[] ], 0);
-
- p = add ( add (.etc.krb5_conf.v, realm), "kdc");
-
- Testsuite::Test(``(Kerberos::ReadFile (p, "test.suse.cz")), [ READ, $[], $[] ], 0);
-
- p = add ( add (.etc.krb5_conf.v, "SUSE.DE"), "kdc");
-
- Testsuite::Test(``(Kerberos::ReadFile (p, "test.suse.de")), [ READ, $[], $[] ], 0);
-
- p = .etc.krb5_conf.v.pam.ticket_lifetime;
-
- Testsuite::Test(``(Kerberos::ReadFile (p, "1d")), [ READ, $[], $[] ], 0);
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/ReadKrb5ConfValue.out new/yast2-kerberos-client-2.15.3/testsuite/tests/ReadKrb5ConfValue.out
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/ReadKrb5ConfValue.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/ReadKrb5ConfValue.out 2007-02-20 13:11:33.000000000 +0100
@@ -0,0 +1,8 @@
+Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"]
+Return SUSE.CZ
+Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["chimera.suse.cz"]
+Return chimera.suse.cz
+Read .etc.krb5_conf.v."SUSE.DE"."kdc" nil
+Return test.suse.de
+Read .etc.krb5_conf.v.pam.ticket_lifetime nil
+Return 1d
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/ReadKrb5ConfValue.ycp new/yast2-kerberos-client-2.15.3/testsuite/tests/ReadKrb5ConfValue.ycp
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/ReadKrb5ConfValue.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/ReadKrb5ConfValue.ycp 2007-02-20 13:10:50.000000000 +0100
@@ -0,0 +1,50 @@
+/**
+ * ReadKrb5ConfValue.ycp
+ * Test of Kerberos::ReadKrb5ConfValue function
+ * Author: Jiri Suchomel
+ * $Id: ReadKrb5ConfValue.ycp 21833 2005-02-22 13:51:43Z jsuchome $
+ */
+
+{
+ // testedfiles: Kerberos.ycp
+ import "Testsuite";
+ import "Kerberos";
+
+ map READ = $[
+ "etc": $[
+ // /etc/krb5.conf
+ "krb5_conf" : $[
+ "v" : $[
+ "libdefaults": $[
+ "default_realm": ["SUSE.CZ"],
+ "clockskew": ["500"]
+ ],
+ "SUSE.CZ": $[
+ "kdc": ["chimera.suse.cz"],
+ "default_domain": nil,
+ ],
+ "pam" : $[
+ "ticket_lifetime": nil,
+ ],
+ "SUSE.DE": nil
+ ],
+ ],
+ ]
+ ];
+
+ path p = .etc.krb5_conf.v.libdefaults.default_realm;
+
+ string realm = (string)Testsuite::Test(``(Kerberos::ReadKrb5ConfValue (p, "")), [ READ, $[], $[] ], 0);
+
+ p = add ( add (.etc.krb5_conf.v, realm), "kdc");
+
+ Testsuite::Test(``(Kerberos::ReadKrb5ConfValue (p, "test.suse.cz")), [ READ, $[], $[] ], 0);
+
+ p = add ( add (.etc.krb5_conf.v, "SUSE.DE"), "kdc");
+
+ Testsuite::Test(``(Kerberos::ReadKrb5ConfValue (p, "test.suse.de")), [ READ, $[], $[] ], 0);
+
+ p = .etc.krb5_conf.v.pam.ticket_lifetime;
+
+ Testsuite::Test(``(Kerberos::ReadKrb5ConfValue (p, "1d")), [ READ, $[], $[] ], 0);
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/Read.out new/yast2-kerberos-client-2.15.3/testsuite/tests/Read.out
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/Read.out 2006-09-12 09:22:09.000000000 +0200
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/Read.out 2007-02-20 13:06:00.000000000 +0100
@@ -1,9 +1,9 @@
Dump ==== reading... ============================
Execute .target.bash_output "pam-config -q --krb5" $["stdout":"password: "]
Dir .etc.krb5_conf.s: []
-Read .etc.krb5_conf.v.libdefaults.default_realm "SUSE.CZ"
-Read .etc.krb5_conf.v.libdefaults.clockskew "500"
-Read .etc.krb5_conf.v."SUSE.CZ"."kdc" "chimera.suse.cz"
+Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"]
+Read .etc.krb5_conf.v.libdefaults.clockskew ["500"]
+Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["chimera.suse.cz", "kdc.suse.cz"]
Read .etc.krb5_conf.v."SUSE.CZ"."admin_server" nil
Read .etc.krb5_conf.v."SUSE.CZ"."default_domain" nil
Read .etc.krb5_conf.v.pam.ticket_lifetime nil
@@ -11,8 +11,8 @@
Read .etc.krb5_conf.v.pam.forwardable nil
Read .etc.krb5_conf.v.pam.proxiable nil
Read .etc.krb5_conf.v.pam.retain_after_close nil
-Read .etc.krb5_conf.v.pam.minimum_uid "1"
-Read .etc.krb5_conf.v.pam.use_shmem ""
+Read .etc.krb5_conf.v.pam.minimum_uid ["1"]
+Read .etc.krb5_conf.v.pam.use_shmem [""]
Execute .target.bash_output "/bin/ypdomainname" $["stdout":"password: "]
Dir .etc.ssh.ssh_config.s: ["*"]
Execute .target.bash_output "LANG=C /bin/hostname" $["stdout":"password: "]
@@ -24,7 +24,7 @@
Dump ============================================
Dump kerberos used: true
Dump default realm: SUSE.CZ
-Dump kdc: chimera.suse.cz
+Dump kdc: chimera.suse.cz kdc.suse.cz
Dump
Dump ssh support: true
Dump ============================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/Read.ycp new/yast2-kerberos-client-2.15.3/testsuite/tests/Read.ycp
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/Read.ycp 2006-09-12 13:47:40.000000000 +0200
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/Read.ycp 2007-02-20 13:05:47.000000000 +0100
@@ -17,22 +17,22 @@
"krb5_conf" : $[
"v" : $[
"libdefaults": $[
- "default_realm": "SUSE.CZ",
- "clockskew": "500"
+ "default_realm": ["SUSE.CZ"],
+ "clockskew": ["500"]
],
"SUSE.CZ": $[
- "kdc": "chimera.suse.cz",
+ "kdc": ["chimera.suse.cz", "kdc.suse.cz"],
"admin_server": nil,
"default_domain": nil,
],
"pam" : $[
- "minimum_uid": "1",
+ "minimum_uid": ["1"],
"renew_lifetime": nil,
"ticket_lifetime": nil,
"forwardable": nil,
"proxiable": nil,
"retain_after_close": nil,
- "use_shmem" : "",
+ "use_shmem" : [""],
"use_authtok" : nil,
]
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/WriteFile.out new/yast2-kerberos-client-2.15.3/testsuite/tests/WriteFile.out
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/WriteFile.out 2005-09-08 10:36:16.000000000 +0200
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/WriteFile.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-Write .etc.krb5_conf.v.libdefaults.default_realm "SUSE" true
-Return true
-Return false
-Return false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/WriteFile.ycp new/yast2-kerberos-client-2.15.3/testsuite/tests/WriteFile.ycp
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/WriteFile.ycp 2006-03-02 12:46:50.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/WriteFile.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-/**
- * WriteFile.ycp
- * Test of Kerberos::WriteFile function
- * Author: Jiri Suchomel
- * $Id: WriteFile.ycp 27936 2006-02-13 20:01:14Z olh $
- */
-
-{
- // testedfiles: Kerberos.ycp
- import "Testsuite";
- import "Kerberos";
-
- path p = .etc.krb5_conf.v.libdefaults.default_realm;
-
- Testsuite::Test(``(Kerberos::WriteFile (p, "SUSE")), [ $[], $[], $[] ], 0);
-
- Testsuite::Test(``(Kerberos::WriteFile (p, "")), [ $[], $[], $[] ], 0);
-
- Testsuite::Test(``(Kerberos::WriteFile (p, nil)), [ $[], $[], $[] ], 0);
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/WriteKrb5ConfValue.out new/yast2-kerberos-client-2.15.3/testsuite/tests/WriteKrb5ConfValue.out
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/WriteKrb5ConfValue.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/WriteKrb5ConfValue.out 2007-02-20 13:15:36.000000000 +0100
@@ -0,0 +1,8 @@
+Write .etc.krb5_conf.v.libdefaults.default_realm ["SUSE"] true
+Return true
+Return false
+Return false
+Write .etc.krb5_conf.v.SUSE.kdc ["kdc.suse.cz", "kdc.suse.de"] true
+Return true
+Write .etc.krb5_conf.v.SUSE.kdc ["kdc.suse.cz", "kdc.suse.de"] true
+Return true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/WriteKrb5ConfValue.ycp new/yast2-kerberos-client-2.15.3/testsuite/tests/WriteKrb5ConfValue.ycp
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/WriteKrb5ConfValue.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/WriteKrb5ConfValue.ycp 2007-02-20 13:15:25.000000000 +0100
@@ -0,0 +1,25 @@
+/**
+ * WriteKrb5ConfValue.ycp
+ * Test of Kerberos::WriteKrb5ConfValue function
+ * Author: Jiri Suchomel
+ * $Id: WriteKrb5ConfValue.ycp 27936 2006-02-13 20:01:14Z olh $
+ */
+
+{
+ // testedfiles: Kerberos.ycp
+ import "Testsuite";
+ import "Kerberos";
+
+ path p = .etc.krb5_conf.v.libdefaults.default_realm;
+
+ Testsuite::Test(``(Kerberos::WriteKrb5ConfValue (p, "SUSE")), [ $[], $[], $[] ], 0);
+
+ Testsuite::Test(``(Kerberos::WriteKrb5ConfValue (p, "")), [ $[], $[], $[] ], 0);
+
+ Testsuite::Test(``(Kerberos::WriteKrb5ConfValue (p, nil)), [ $[], $[], $[] ], 0);
+
+ p = .etc.krb5_conf.v.SUSE.kdc;
+ Testsuite::Test(``(Kerberos::WriteKrb5ConfValues (p, ["kdc.suse.cz", "kdc.suse.de"])), [ $[], $[], $[] ], 0);
+
+ Testsuite::Test(``(Kerberos::WriteKrb5ConfValuesAsString (p, "kdc.suse.cz kdc.suse.de")), [ $[], $[], $[] ], 0);
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/testsuite/tests/Write.out new/yast2-kerberos-client-2.15.3/testsuite/tests/Write.out
--- old/yast2-kerberos-client-2.15.2/testsuite/tests/Write.out 2006-09-12 15:04:52.000000000 +0200
+++ new/yast2-kerberos-client-2.15.3/testsuite/tests/Write.out 2007-02-20 13:12:06.000000000 +0100
@@ -13,34 +13,34 @@
Return true
Dump ==== only krb5.conf modified =====================================
Dump ==== (all sections exist) ========================================
-Write .etc.krb5_conf.v.libdefaults.default_realm "SUSE.CZ" true
-Write .etc.krb5_conf.v.libdefaults.clockskew "300" true
+Write .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] true
+Write .etc.krb5_conf.v.libdefaults.clockskew ["300"] true
Dir .etc.krb5_conf.s: ["SUSE.CZ", "libdefaults", "pam"]
-Write .etc.krb5_conf.v."SUSE.CZ"."kdc" "chimera.suse.cz" true
-Write .etc.krb5_conf.v."SUSE.CZ"."admin_server" "chimera.suse.cz" true
+Write .etc.krb5_conf.v."SUSE.CZ"."kdc" ["chimera.suse.cz"] true
+Write .etc.krb5_conf.v."SUSE.CZ"."admin_server" ["chimera.suse.cz"] true
Dir .etc.krb5_conf.s: ["SUSE.CZ", "libdefaults", "pam"]
-Write .etc.krb5_conf.v.pam."ticket_lifetime" "1d" true
-Write .etc.krb5_conf.v.pam."renew_lifetime" "1d" true
-Write .etc.krb5_conf.v.pam."forwardable" "true" true
-Write .etc.krb5_conf.v.pam."proxiable" "false" true
-Write .etc.krb5_conf.v.pam."retain_after_close" "false" true
-Write .etc.krb5_conf.v.pam."minimum_uid" "1" true
-Write .etc.krb5_conf.v.pam."use_shmem" "sshd" true
+Write .etc.krb5_conf.v.pam."ticket_lifetime" ["1d"] true
+Write .etc.krb5_conf.v.pam."renew_lifetime" ["1d"] true
+Write .etc.krb5_conf.v.pam."forwardable" ["true"] true
+Write .etc.krb5_conf.v.pam."proxiable" ["false"] true
+Write .etc.krb5_conf.v.pam."retain_after_close" ["false"] true
+Write .etc.krb5_conf.v.pam."minimum_uid" ["1"] true
+Write .etc.krb5_conf.v.pam."use_shmem" ["sshd"] true
Write .etc.krb5_conf nil true
Return true
Dump ==== (pam section doesn't exist) =================================
-Write .etc.krb5_conf.v.libdefaults.default_realm "SUSE.CZ" true
-Write .etc.krb5_conf.v.libdefaults.clockskew "300" true
+Write .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] true
+Write .etc.krb5_conf.v.libdefaults.clockskew ["300"] true
Dir .etc.krb5_conf.s: ["SUSE.CZ", "libdefaults"]
-Write .etc.krb5_conf.v."SUSE.CZ"."kdc" "chimera.suse.cz" true
+Write .etc.krb5_conf.v."SUSE.CZ"."kdc" ["chimera.suse.cz"] true
Dir .etc.krb5_conf.s: ["SUSE.CZ", "libdefaults"]
Write .etc.krb5_conf.st.appdefaults.pam 1 true
-Write .etc.krb5_conf.v.appdefaults.pam."ticket_lifetime" "1d" true
-Write .etc.krb5_conf.v.appdefaults.pam."renew_lifetime" "1d" true
-Write .etc.krb5_conf.v.appdefaults.pam."forwardable" "true" true
-Write .etc.krb5_conf.v.appdefaults.pam."proxiable" "false" true
-Write .etc.krb5_conf.v.appdefaults.pam."retain_after_close" "false" true
-Write .etc.krb5_conf.v.appdefaults.pam."minimum_uid" "1" true
-Write .etc.krb5_conf.v.appdefaults.pam."use_shmem" "sshd" true
+Write .etc.krb5_conf.v.appdefaults.pam."ticket_lifetime" ["1d"] true
+Write .etc.krb5_conf.v.appdefaults.pam."renew_lifetime" ["1d"] true
+Write .etc.krb5_conf.v.appdefaults.pam."forwardable" ["true"] true
+Write .etc.krb5_conf.v.appdefaults.pam."proxiable" ["false"] true
+Write .etc.krb5_conf.v.appdefaults.pam."retain_after_close" ["false"] true
+Write .etc.krb5_conf.v.appdefaults.pam."minimum_uid" ["1"] true
+Write .etc.krb5_conf.v.appdefaults.pam."use_shmem" ["sshd"] true
Write .etc.krb5_conf nil true
Return true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.15.2/VERSION new/yast2-kerberos-client-2.15.3/VERSION
--- old/yast2-kerberos-client-2.15.2/VERSION 2007-02-16 15:46:13.000000000 +0100
+++ new/yast2-kerberos-client-2.15.3/VERSION 2007-02-20 13:16:22.000000000 +0100
@@ -1 +1 @@
-2.15.2
+2.15.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org