Author: jsuchome Date: Tue Aug 26 13:03:09 2008 New Revision: 50371 URL: http://svn.opensuse.org/viewcvs/yast?rev=50371&view=rev Log: - added 3rd possible value to ComboBox with services (patch from mc) - different PAM configuration when LDAP is in use (patch from mc) - 2.17.0 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/src/dialogs.ycp trunk/kerberos-client/testsuite/tests/Write.out Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=50371&r1=50370&r2=50371&view=diff ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Tue Aug 26 13:03:09 2008 @@ -1 +1 @@ -2.16.11 +2.17.0 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-kerberos-client.changes?rev=50371&r1=50370&r2=50371&view=diff ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Tue Aug 26 13:03:09 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 25 09:51:36 CEST 2008 - jsuchome@suse.cz + +- added 3rd possible value to ComboBox with services (patch from mc) +- different PAM configuration when LDAP is in use (patch from mc) +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp?rev=50371&r1=50370&r2=50371&view=diff ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Tue Aug 26 13:03:09 2008 @@ -493,6 +493,9 @@ if (use_pam_krb) { Pam::Add ("krb5"); + // If ldap is configured we need to change it to ldap-account_only + if (Pam::Enabled("ldap")) + Pam::Add("ldap-account_only"); if (ignore_unknown) Pam::Add ("krb5-ignore_unknown_principals"); else @@ -500,6 +503,9 @@ } else { + // if ldap-account_only is used we need to change it to ldap + if (Pam::Enabled("ldap-account_only")) + Pam::Add("ldap"); Pam::Remove ("krb5"); } } Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?rev=50371&r1=50370&r2=50371&view=diff ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Tue Aug 26 13:03:09 2008 @@ -145,7 +145,9 @@ // combo box item `item (`id ("true"), _("All services"), "true" == value), // combo box item - `item (`id ("false"), _("No services"), "false" == value || value == "") + `item (`id ("false"), _("No services"), "false" == value), + // combo box item + `item (`id (""), _("Not set"), value == "") ]; if (! contains (["true", "false", ""], value)) items = add (items, `item (`id (value), value, true)); Modified: trunk/kerberos-client/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/testsuite/tests/Write.out?rev=50371&r1=50370&r2=50371&view=diff ============================================================================== --- trunk/kerberos-client/testsuite/tests/Write.out (original) +++ trunk/kerberos-client/testsuite/tests/Write.out Tue Aug 26 13:03:09 2008 @@ -2,6 +2,7 @@ Return true Dump ==== pam enabled with krb5-ignore_unknown_principals= Execute .target.bash_output "pam-config -a --krb5" $["stdout":""] +Execute .target.bash_output "pam-config -q --ldap" $["stdout":""] Execute .target.bash_output "pam-config -a --krb5-ignore_unknown_principals" $["stdout":""] Return true Dump ==== ssh modified (enabled) ====================================== @@ -10,6 +11,7 @@ Write .etc.ssh.ssh_config nil true Return true Dump ==== kerberos disabled, ssh support disabled, krb5.conf untouched= +Execute .target.bash_output "pam-config -q --ldap-account_only" $["stdout":""] 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org