Hello community,
here is the log from the commit of package yast2-kerberos-client
checked in at Fri Aug 25 15:40:42 CEST 2006.
--------
--- yast2-kerberos-client/yast2-kerberos-client.changes 2006-04-12 13:48:41.000000000 +0200
+++ yast2-kerberos-client/yast2-kerberos-client.changes 2006-08-25 15:15:17.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 25 12:59:27 CEST 2006 - jsuchome@suse.cz
+
+- adapted for pam-config usage (F300956)
+- API of PamSettings module is obsolete
+- 2.14.0
+
+-------------------------------------------------------------------
Old:
----
yast2-kerberos-client-2.13.4.tar.bz2
New:
----
yast2-kerberos-client-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-kerberos-client.spec ++++++
--- /var/tmp/diff_new_pack.9oTFIV/_old 2006-08-25 15:38:08.000000000 +0200
+++ /var/tmp/diff_new_pack.9oTFIV/_new 2006-08-25 15:38:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-kerberos-client (Version 2.13.4)
+# spec file for package yast2-kerberos-client (Version 2.14.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,15 +11,16 @@
# norootforbuild
Name: yast2-kerberos-client
-Version: 2.13.4
+Version: 2.14.0
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-kerberos-client-2.13.4.tar.bz2
+Source0: yast2-kerberos-client-2.14.0.tar.bz2
prefix: /usr
BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite
-Requires: yast2 yast2-pam
+# new Pam.ycp API
+Requires: yast2 yast2-pam >= 2.14.0
BuildArchitectures: noarch
Summary: YaST2 - Kerberos Client Configuration
@@ -34,7 +35,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-kerberos-client-2.13.4
+%setup -n yast2-kerberos-client-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -72,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-kerberos-client
%changelog -n yast2-kerberos-client
+* Fri Aug 25 2006 - jsuchome@suse.cz
+- adapted for pam-config usage (F300956)
+- API of PamSettings module is obsolete
+- 2.14.0
* Wed Apr 12 2006 - jsuchome@suse.cz
- fixed installing architecture-specific packages (#164313)
- 2.13.4
++++++ yast2-kerberos-client-2.13.4.tar.bz2 -> yast2-kerberos-client-2.14.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.13.4/VERSION new/yast2-kerberos-client-2.14.0/VERSION
--- old/yast2-kerberos-client-2.13.4/VERSION 2006-04-12 13:20:02.000000000 +0200
+++ new/yast2-kerberos-client-2.14.0/VERSION 2006-08-25 12:59:25.000000000 +0200
@@ -1 +1 @@
-2.13.4
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.13.4/src/Kerberos.ycp new/yast2-kerberos-client-2.14.0/src/Kerberos.ycp
--- old/yast2-kerberos-client-2.13.4/src/Kerberos.ycp 2006-04-12 13:19:27.000000000 +0200
+++ new/yast2-kerberos-client-2.14.0/src/Kerberos.ycp 2006-08-25 14:01:03.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of kerberos-client, i/o functions.
* Authors: Jiri Suchomel
*
- * $Id: Kerberos.ycp 26601 2005-12-19 11:49:09Z jsuchome $
+ * $Id: Kerberos.ycp 30053 2006-04-12 11:49:20Z jsuchome $
*
* Representation of the configuration of kerberos-client.
* Input and output routines.
@@ -21,7 +21,7 @@
import "Label";
import "Mode";
import "Package";
-import "PamSettings";
+import "Pam";
import "Popup";
import "Progress";
import "Service";
@@ -37,13 +37,6 @@
// if pam_krb5 module is used for login
global boolean use_pam_krb = false;
-// if pam_krb5afs module is used for login
-global boolean use_afs = false;
-
-// current pam modules called by pam_unix (value of call_modules=... in
-// /etc/security/pam_unix2)
-list<string> auth_modules = [];
-
// if pam_unix is in /etc/pam.d/login
boolean pam_unix_present = false;
@@ -195,26 +188,7 @@
*/
global define boolean Read () ``{
- // check only "auth"?
- list<string> auth_settings = PamSettings::GetValues ("pam_unix2", "auth");
- boolean comment = false;
- foreach (string val, auth_settings, ``{
- if (substring (val, 0, 1) == "#")
- comment = true;
- if (comment)
- return;
- if (contains (auth_settings, "use_krb5"))
- use_pam_krb = true;
- if (issubstring (val, "call_modules="))
- {
- list line_split = splitstring (val, "=");
- auth_modules = splitstring (line_split[1]:"",",");
- if (contains (auth_modules, "krb5afs"))
- {
- use_pam_krb = true;
- }
- }
- });
+ use_pam_krb = Pam::Enabled ("krb5");
// now read the settings from /etc/krb5.conf
if (FileUtils::Exists ("/etc/krb5.conf"))
@@ -373,29 +347,12 @@
{
if (use_pam_krb)
{
- auth_modules = filter (string m, auth_modules,``(m != "krb5afs"));
- foreach (string type, [ "account", "auth", "password" ], {
- PamSettings::AddValue ("unix2", type, "use_krb5");
- PamSettings::RemoveValue ("unix2", type,"call_modules");
- if (auth_modules != [])
- PamSettings::AddValue ("unix2", type, sformat (
- "call_modules=%1", mergestring (auth_modules,",")));
- });
+ Pam::Add ("krb5");
}
else
{
- auth_modules = filter (string m, auth_modules,``(m != "krb5afs"));
- foreach (string type, [ "account", "auth", "password" ], ``{
- PamSettings::RemoveValue ("unix2", type, "use_krb5");
- PamSettings::RemoveValue ("unix2", type, "call_modules");
- if (auth_modules != [])
- PamSettings::AddValue ("unix2", type, sformat (
- "call_modules=%1", mergestring (auth_modules,",")));
-
- });
+ Pam::Remove ("krb5");
}
- // write the changes now
- PamSettings::Write (false);
}
// -- write to /etc/krb5.conf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.13.4/testsuite/tests/Read.out new/yast2-kerberos-client-2.14.0/testsuite/tests/Read.out
--- old/yast2-kerberos-client-2.13.4/testsuite/tests/Read.out 2005-11-24 08:58:08.000000000 +0100
+++ new/yast2-kerberos-client-2.14.0/testsuite/tests/Read.out 2006-08-25 14:11:46.000000000 +0200
@@ -1,6 +1,5 @@
Dump ==== reading... ============================
-Dir .etc.security.section: ["/etc/security/pam_pwcheck.conf", "/etc/security/pam_unix2.conf"]
-Read .etc.security.v."/etc/security/pam_unix2.conf"."auth" "nullok use_krb5"
+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"
@@ -14,9 +13,9 @@
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.try_first_pass "false"
-Execute .target.bash_output "/bin/ypdomainname" $["stdout":"suse.cz"]
+Execute .target.bash_output "/bin/ypdomainname" $["stdout":"password: "]
Dir .etc.ssh.ssh_config.s: ["*"]
-Execute .target.bash_output "LANG=C /bin/hostname" $["stdout":"suse.cz"]
+Execute .target.bash_output "LANG=C /bin/hostname" $["stdout":"password: "]
Dir .etc.ssh.ssh_config.s: ["*"]
Dir .etc.ssh.ssh_config.v."*": ["GSSAPIAuthentication", "GSSAPIDelegateCredentials"]
Read .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "yes"
@@ -24,19 +23,16 @@
Return true
Dump ============================================
Dump kerberos used: true
-Dump AFS used: false
-Dump
-Dump default domain: suse.cz
Dump default realm: SUSE.CZ
Dump kdc: chimera.suse.cz
Dump
Dump ssh support: true
Dump ============================================
Dump ==== reading... ============================
-Read .etc.security.v."/etc/security/pam_unix2.conf"."auth" "nullok use_krb5"
+Execute .target.bash_output "pam-config -q --krb5" $["stdout":"password: "]
Execute .target.bash "/usr/bin/touch /etc/krb5.conf" 0
Dir .etc.ssh.ssh_config.s: ["*"]
-Execute .target.bash_output "LANG=C /bin/hostname" $["stdout":"suse.cz"]
+Execute .target.bash_output "LANG=C /bin/hostname" $["stdout":"password: "]
Dir .etc.ssh.ssh_config.s: ["*"]
Dir .etc.ssh.ssh_config.v."*": ["GSSAPIAuthentication", "GSSAPIDelegateCredentials"]
Read .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "yes"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.13.4/testsuite/tests/Read.ycp new/yast2-kerberos-client-2.14.0/testsuite/tests/Read.ycp
--- old/yast2-kerberos-client-2.13.4/testsuite/tests/Read.ycp 2005-09-08 10:36:17.000000000 +0200
+++ new/yast2-kerberos-client-2.14.0/testsuite/tests/Read.ycp 2006-08-25 14:11:28.000000000 +0200
@@ -7,7 +7,7 @@
{
- // testedfiles: Kerberos.ycp PamSettings.ycp
+ // testedfiles: Kerberos.ycp Pam.ycp
import "Testsuite";
import "Kerberos";
@@ -76,9 +76,11 @@
map EX = $[
"target": $[
"bash": 0,
- // call of ypdomainname
"bash_output": $[
- "stdout" : "suse.cz"
+// call of ypdomainname
+// "stdout" : "suse.cz"
+// call of pam-config
+ "stdout" : "password: "
]
]
];
@@ -90,9 +92,7 @@
Testsuite::Dump ("============================================");
Testsuite::Dump ( sformat ("kerberos used: %1", Kerberos::use_pam_krb) );
- Testsuite::Dump ( sformat ("AFS used: %1", Kerberos::use_afs) );
- Testsuite::Dump ( sformat ("\ndefault domain: %1", Kerberos::default_domain) );
Testsuite::Dump ( sformat ("default realm: %1", Kerberos::default_realm) );
Testsuite::Dump ( sformat ("kdc: %1", Kerberos::kdc) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.13.4/testsuite/tests/Write.out new/yast2-kerberos-client-2.14.0/testsuite/tests/Write.out
--- old/yast2-kerberos-client-2.13.4/testsuite/tests/Write.out 2005-09-08 10:36:16.000000000 +0200
+++ new/yast2-kerberos-client-2.14.0/testsuite/tests/Write.out 2006-08-25 13:17:17.000000000 +0200
@@ -6,28 +6,11 @@
Write .etc.ssh.ssh_config nil true
Return true
Dump ==== kerberos disabled, ssh support disabled, krb5.conf untouched=
-Dir .etc.security.section: ["/etc/security/pam_pwcheck.conf", "/etc/security/pam_unix2.conf"]
-Read .etc.security.v."/etc/security/pam_unix2.conf"."account" "use_krb5"
-Write .etc.security.v."/etc/security/pam_unix2.conf"."account" "" true
-Read .etc.security.v."/etc/security/pam_unix2.conf"."account" "use_krb5"
-Write .etc.security.v."/etc/security/pam_unix2.conf"."account" "use_krb5" true
-Read .etc.security.v."/etc/security/pam_unix2.conf"."auth" "nullok use_krb5"
-Write .etc.security.v."/etc/security/pam_unix2.conf"."auth" "nullok" true
-Read .etc.security.v."/etc/security/pam_unix2.conf"."auth" "nullok use_krb5"
-Write .etc.security.v."/etc/security/pam_unix2.conf"."auth" "nullok use_krb5" true
-Read .etc.security.v."/etc/security/pam_unix2.conf"."password" "nullok use_ldap use_krb5"
-Write .etc.security.v."/etc/security/pam_unix2.conf"."password" "nullok use_ldap" true
-Read .etc.security.v."/etc/security/pam_unix2.conf"."password" "nullok use_ldap use_krb5"
-Write .etc.security.v."/etc/security/pam_unix2.conf"."password" "nullok use_ldap use_krb5" true
-Write .etc.security nil true
+Execute .target.bash_output "pam-config -d --krb5" $["stdout":""]
Write .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "no" true
Write .etc.ssh.ssh_config.v."*"."GSSAPIDelegateCredentials" "no" true
Write .etc.ssh.ssh_config nil true
Return true
-Dump
-Dump The map with original values is always read again in
-Dump PamSettings::RemoveValue() function, so the output is strange...
-Dump
Dump ==== only krb5.conf modified =====================================
Dump ==== (all sections exist) ========================================
Write .etc.krb5_conf.v.libdefaults.default_realm "SUSE.CZ" true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.13.4/testsuite/tests/Write.ycp new/yast2-kerberos-client-2.14.0/testsuite/tests/Write.ycp
--- old/yast2-kerberos-client-2.13.4/testsuite/tests/Write.ycp 2005-09-08 10:36:17.000000000 +0200
+++ new/yast2-kerberos-client-2.14.0/testsuite/tests/Write.ycp 2006-08-25 13:16:49.000000000 +0200
@@ -7,7 +7,7 @@
{
- // testedfiles: Kerberos.ycp PamSettings.ycp
+ // testedfiles: Kerberos.ycp Pam.ycp
import "Testsuite";
import "Kerberos";
@@ -39,17 +39,24 @@
];
map WRITE = $[];
+ map EX = $[
+ "target": $[
+ "bash_output": $[
+ "stdout" : ""
+ ]
+ ]
+ ];
Testsuite::Dump ("==== writing without any changes =================================");
- Testsuite::Test(``(Kerberos::Write ()), [ $[], WRITE, $[] ], 0);
+ Testsuite::Test(``(Kerberos::Write ()), [ $[], WRITE, EX ], 0);
Testsuite::Dump ("==== ssh modified (enabled) ======================================");
Kerberos::ssh_modified = true;
Kerberos::ssh_support = true;
- Testsuite::Test(``(Kerberos::Write ()), [ $[], WRITE, $[] ], 0);
+ Testsuite::Test(``(Kerberos::Write ()), [ $[], WRITE, EX ], 0);
Testsuite::Dump ("==== kerberos disabled, ssh support disabled, krb5.conf untouched=");
@@ -57,10 +64,7 @@
Kerberos::use_pam_krb = false;
Kerberos::ssh_support = false;
- Testsuite::Test(``(Kerberos::Write ()), [ READ, WRITE, $[] ], 0);
-
- Testsuite::Dump ("\nThe map with original values is always read again in");
- Testsuite::Dump ("PamSettings::RemoveValue() function, so the output is strange...\n");
+ Testsuite::Test(``(Kerberos::Write ()), [ READ, WRITE, EX ], 0);
Testsuite::Dump ("==== only krb5.conf modified =====================================");
Testsuite::Dump ("==== (all sections exist) ========================================");
@@ -72,7 +76,7 @@
Kerberos::default_realm = "SUSE.CZ";
Kerberos::kdc = "chimera.suse.cz";
- Testsuite::Test(``(Kerberos::Write ()), [ READ, WRITE, $[] ], 0);
+ Testsuite::Test(``(Kerberos::Write ()), [ READ, WRITE, EX ], 0);
Testsuite::Dump ("==== (pam section doesn't exist) =================================");
READ = $[
@@ -87,5 +91,5 @@
];
Kerberos::admin_server = "user_defined"; // -> won't be written
- Testsuite::Test(``(Kerberos::Write ()), [ READ, $[], $[] ], 0);
+ Testsuite::Test(``(Kerberos::Write ()), [ READ, $[], EX ], 0);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org