Hello community,
here is the log from the commit of package yast2-kerberos-client for
openSUSE:Factory
checked in at Thu Mar 17 10:32:05 CET 2011.
--------
--- yast2-kerberos-client/yast2-kerberos-client.changes 2011-01-24
16:22:29.000000000 +0100
+++
/mounts/work_src_done/STABLE/yast2-kerberos-client/yast2-kerberos-client.changes
2011-03-16 14:53:09.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 16 14:51:12 CET 2011 - [email protected]
+
+- show an info that sssd is configured (fate#308902)
+- 2.21.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-kerberos-client-2.20.3.tar.bz2
New:
----
yast2-kerberos-client-2.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-kerberos-client.spec ++++++
--- /var/tmp/diff_new_pack.bPCuGz/_old 2011-03-17 10:29:36.000000000 +0100
+++ /var/tmp/diff_new_pack.bPCuGz/_new 2011-03-17 10:29:36.000000000 +0100
@@ -19,11 +19,11 @@
Name: yast2-kerberos-client
-Version: 2.20.3
+Version: 2.21.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-kerberos-client-2.20.3.tar.bz2
+Source0: yast2-kerberos-client-2.21.0.tar.bz2
Prefix: /usr
@@ -46,7 +46,7 @@
Kerberos server will be used for user authentication.
%prep
-%setup -n yast2-kerberos-client-2.20.3
+%setup -n yast2-kerberos-client-2.21.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-kerberos-client-2.20.3.tar.bz2 ->
yast2-kerberos-client-2.21.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-kerberos-client-2.20.3/VERSION
new/yast2-kerberos-client-2.21.0/VERSION
--- old/yast2-kerberos-client-2.20.3/VERSION 2011-01-24 16:19:35.000000000
+0100
+++ new/yast2-kerberos-client-2.21.0/VERSION 2011-03-16 14:52:14.000000000
+0100
@@ -1 +1 @@
-2.20.3
+2.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-kerberos-client-2.20.3/src/Kerberos.ycp
new/yast2-kerberos-client-2.21.0/src/Kerberos.ycp
--- old/yast2-kerberos-client-2.20.3/src/Kerberos.ycp 2011-01-24
16:20:55.000000000 +0100
+++ new/yast2-kerberos-client-2.21.0/src/Kerberos.ycp 2011-03-16
14:48:28.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of kerberos-client, i/o functions.
* Authors: Jiri Suchomel <[email protected]>
*
- * $Id: Kerberos.ycp 63252 2011-01-21 12:03:18Z jsuchome $
+ * $Id: Kerberos.ycp 63261 2011-01-24 15:21:24Z jsuchome $
*
* Representation of the configuration of kerberos-client.
* Input and output routines.
@@ -90,6 +90,9 @@
// if DNS is used for retrieving configuration data
global boolean dns_used = false;
+// if sssd is configured, do not use pam_krb5
+global boolean sssd = false;
+
/**
map with the settings configurable in the expert tabs
*/
@@ -134,6 +137,8 @@
ExpertSettings = client["ExpertSettings"]:$[];
if (!haskey (ExpertSettings, "use_shmem") && haskey (client, "use_shmem"))
ExpertSettings["use_shmem"] = use_shmem;
+
+ sssd = settings["sssd"]:sssd;
pam_modified = true;
modified = true;
ssh_modified = true;
@@ -150,6 +155,7 @@
map export_map = $[
"pam_login": $[
"use_kerberos" : use_pam_krb,
+ "sssd" : sssd,
],
"kerberos_client": $[
"default_domain" : default_domain,
@@ -415,6 +421,8 @@
if (ssh_support == nil)
ssh_support = false;
+ sssd = Pam::Enabled ("sss");
+
return true;
}
@@ -484,7 +492,7 @@
{
// whem sssd is configured, do not use pam_krb5 and update sssd.conf
// fate#308902
- if (Pam::Enabled ("sss"))
+ if (sssd)
{
y2milestone ("not using pam_krb5 because sssd is configured");
Pam::Remove ("krb5");
@@ -734,7 +742,7 @@
list<string> packages = required_packages;
// do not install pam_krb5 if sssd is configured
- if (Pam::Enabled ("sss"))
+ if (sssd)
{
packages = filter (string p, packages, ``(p != "pam_krb5"));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-kerberos-client-2.20.3/src/dialogs.ycp
new/yast2-kerberos-client-2.21.0/src/dialogs.ycp
--- old/yast2-kerberos-client-2.20.3/src/dialogs.ycp 2011-01-24
16:16:58.000000000 +0100
+++ new/yast2-kerberos-client-2.21.0/src/dialogs.ycp 2011-03-16
14:49:49.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel <[email protected]>
*
- * $Id: dialogs.ycp 60608 2010-01-28 15:11:03Z jsuchome $
+ * $Id: dialogs.ycp 63261 2011-01-24 15:21:24Z jsuchome $
*/
{
@@ -392,6 +392,14 @@
UI::ChangeWidget (`id (widget), `Enabled, use_pam_krb);
});
}
+ if (Kerberos::sssd)
+ {
+ // popup message
+ Popup::Message ("System Security Services Daemon (SSSD) is
configured.
+It is in use for Kerberos authentication instead of pam_krb5.
+
+You can disable SSSD in yast2 ldap-client module.");
+ }
}
} while (!contains ([`back, `cancel, `abort, `next, `advanced], result));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-kerberos-client-2.20.3/src/kerberos.rnc
new/yast2-kerberos-client-2.21.0/src/kerberos.rnc
--- old/yast2-kerberos-client-2.20.3/src/kerberos.rnc 2008-12-18
14:47:06.000000000 +0100
+++ new/yast2-kerberos-client-2.21.0/src/kerberos.rnc 2011-03-16
14:47:35.000000000 +0100
@@ -9,7 +9,8 @@
pam_login = element pam_login {
- element use_kerberos { BOOLEAN }?
+ element use_kerberos { BOOLEAN }? &
+ element sssd { BOOLEAN }?
}
kerberos_client = element kerberos_client {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-kerberos-client-2.20.3/testsuite/tests/Read.out
new/yast2-kerberos-client-2.21.0/testsuite/tests/Read.out
--- old/yast2-kerberos-client-2.20.3/testsuite/tests/Read.out 2010-08-06
11:04:54.000000000 +0200
+++ new/yast2-kerberos-client-2.21.0/testsuite/tests/Read.out 2011-03-16
14:50:30.000000000 +0100
@@ -31,6 +31,7 @@
Dir .etc.ssh.ssh_config.v."*": ["GSSAPIAuthentication",
"GSSAPIDelegateCredentials"]
Read .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "yes"
Read .etc.ssh.ssh_config.v."*"."GSSAPIDelegateCredentials" "yes"
+Execute .target.bash_output "/usr/sbin/pam-config -q --sss"
$["stdout":"password: "]
Return true
Dump ============================================
Dump kerberos used: true
@@ -47,6 +48,7 @@
Dir .etc.ssh.ssh_config.v."*": ["GSSAPIAuthentication",
"GSSAPIDelegateCredentials"]
Read .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "yes"
Read .etc.ssh.ssh_config.v."*"."GSSAPIDelegateCredentials" "yes"
+Execute .target.bash_output "/usr/sbin/pam-config -q --sss"
$["stdout":"password: "]
Return true
Dump default realm: SUSE.CZ
Dump ============================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-kerberos-client-2.20.3/testsuite/tests/Write.out
new/yast2-kerberos-client-2.21.0/testsuite/tests/Write.out
--- old/yast2-kerberos-client-2.20.3/testsuite/tests/Write.out 2011-01-20
16:13:08.000000000 +0100
+++ new/yast2-kerberos-client-2.21.0/testsuite/tests/Write.out 2011-03-16
14:50:44.000000000 +0100
@@ -1,7 +1,6 @@
Dump ==== writing without any changes =================================
Return true
Dump ==== pam enabled with krb5-ignore_unknown_principals=
-Execute .target.bash_output "/usr/sbin/pam-config -q --sss"
$["stdout":""]
Execute .target.bash_output "/usr/sbin/pam-config -a --krb5"
$["stdout":""]
Execute .target.bash_output "/usr/sbin/pam-config -q --ldap"
$["stdout":""]
Execute .target.bash_output "/usr/sbin/pam-config -a
--krb5-ignore_unknown_principals" $["stdout":""]
@@ -12,7 +11,6 @@
Write .etc.ssh.ssh_config nil true
Return true
Dump ==== kerberos disabled, ssh support disabled, krb5.conf untouched=
-Execute .target.bash_output "/usr/sbin/pam-config -q --sss"
$["stdout":""]
Execute .target.bash_output "/usr/sbin/pam-config -q
--ldap-account_only" $["stdout":""]
Execute .target.bash_output "/usr/sbin/pam-config -d --krb5"
$["stdout":""]
Write .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "no" true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
