Author: jsuchome Date: Tue Apr 1 11:14:39 2008 New Revision: 45918 URL: http://svn.opensuse.org/viewcvs/yast?rev=45918&view=rev Log: - added CLI options for automounter, mkhomedir and tls (bnc#373825) - adapted Ldap::ShortSummary - 2.16.11 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=45918&... ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Tue Apr 1 11:14:39 2008 @@ -1 +1 @@ -2.16.10 +2.16.11 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-cl... ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Tue Apr 1 11:14:39 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 1 11:07:58 CEST 2008 - jsuchome@suse.cz + +- added CLI options for automounter, mkhomedir and tls (bnc#373825) +- adapted Ldap::ShortSummary +- 2.16.11 + +------------------------------------------------------------------- Wed Mar 26 10:39:22 CET 2008 - jsuchome@suse.cz - do not use Accept button, but OK (fate #120373) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=4591... ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Tue Apr 1 11:14:39 2008 @@ -481,11 +481,19 @@ // summary text sformat (_("<b>Base DN</b>:%1<br>"), base_dn != "" ? base_dn : nc) + // summary text (yes/no follows) - sformat (_("<b>Client Enabled</b>:%1<br>"), start ? + sformat (_("<b>Client Enabled</b>:%1"), start ? // summary (client enabled?) _("Yes") : // summary (client enabled?) _("No")); + if (_start_autofs) + // summary + summary = summary + "<br>" + _("Automounter Configured"); + if (ldap_tls) + { + // summary + summary = summary + "<br>" + _("LDAP TLS/SSL Configured"); + } return summary; } Modified: trunk/ldap-client/src/ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap.ycp?rev=4591... ============================================================================== --- trunk/ldap-client/src/ldap.ycp (original) +++ trunk/ldap-client/src/ldap.ycp Tue Apr 1 11:14:39 2008 @@ -82,6 +82,34 @@ Ldap::bind_pass = ldappw; Ldap::modified = true; } + if (options["automounter"]:"" == "yes" && !Ldap::_start_autofs) + { + Ldap::_start_autofs = true; + Ldap::modified = true; + } + if (options["automounter"]:"" == "no" && Ldap::_start_autofs) + { + Ldap::_start_autofs = false; + Ldap::modified = true; + } + if (options["mkhomedir"]:"" != "") + { + boolean mkhomedir = (options["mkhomedir"]:"" == "yes"); + if (Ldap::mkhomedir != mkhomedir) + { + Ldap::mkhomedir = mkhomedir; + Ldap::modified = true; + } + } + if (options["tls"]:"" != "") + { + boolean tls = (options["tls"]:"" == "yes"); + if (Ldap::ldap_tls != tls) + { + Ldap::ldap_tls = tls; + Ldap::modified = true; + } + } if (haskey (options, "createconfig")) { @@ -150,11 +178,31 @@ "help" : _("LDAP Server Password"), "type" : "string" ], + "automounter" :$[ + // help text for the 'automounter' option + "help" : _("Start or stop automounter"), + "type" : "enum", + "typespec" : [ "yes", "no" ], + ], + "mkhomedir" : $[ + // help text for the 'mkhomedir' option + "help" : _("Create Home Directory on Login"), + "type" : "enum", + "typespec" : [ "yes", "no" ], + ], + "tls" : $[ + // help text for the 'tls' option + "help" : _("Encrypted connection (StartTLS)"), + "type" : "enum", + "typespec" : [ "yes", "no" ], + ], ], "mappings" : $[ "pam" : [ "enable", "disable" ], "summary" : [], - "configure" : [ "server", "base", "createconfig", "ldappw" ], + "configure" : [ "server", "base", "createconfig", "ldappw", + "automounter", "mkhomedir", "tls" + ], ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org