Author: jsuchome Date: Mon Mar 28 13:53:06 2011 New Revision: 63675 URL: http://svn.opensuse.org/viewcvs/yast?rev=63675&view=rev Log: - removed obsolete On value from 'ldap ssl' option - added help texts for LDAP settings (bnc#531523) - 2.21.0 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/helps.ycp trunk/samba-server/src/ldap-widget.ycp Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=63675&r1... ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Mon Mar 28 13:53:06 2011 @@ -1 +1 @@ -2.20.2 +2.21.0 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba-... ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Mar 28 13:53:06 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 28 13:48:28 CEST 2011 - jsuchome@suse.cz + +- removed obsolete On value from 'ldap ssl' option +- added help texts for LDAP settings (bnc#531523) +- 2.21.0 + +------------------------------------------------------------------- Mon Jan 10 10:56:57 CET 2011 - locilka@suse.cz - Added 'samba-client' firewall service to list of services Modified: trunk/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/helps.ycp?rev=63... ============================================================================== --- trunk/samba-server/src/helps.ycp (original) +++ trunk/samba-server/src/helps.ycp Mon Mar 28 13:53:06 2011 @@ -255,8 +255,35 @@ _("<p><b>Inherit ACLS</b> can be used to ensure that if default ACLs exist on parent directories, they are always honored when creating a subdirectory.</p> -") +"), + + // help for LDAP Settings dialog + "samba_ldap_setting_auth_widget" : _("<p><b><big>LDAP Settings</big></b><br> +Here, it is possible to determine the LDAP server to use for authentication. +</p> +<p> +Setting <b>LDAP Password Back-End</b> allows storing user information in LDAP tree specified by URL. With <b>LDAP Idmap Back-End</b>, store SID/uid/gid mapping tables in LDAP. +</p><p> +In Authentication section, set the credentials for LDAP server, including full Administrator DN. +</p> +<b>Search Base DN</b> is the LDAP suffix appended to Samba specific LDAP objects. +</p><p> +To test the connection to your LDAP server, click <b>Test Connection</b>. To set expert LDAP settings or use default values, click <b>Advanced Settings</b>.<p>"), + + // help for SambaLDAPSettingsSuffixesWidget + "samba_ldap_setting_suffixes_widget" : _("<p><b>User Suffix</b> specifies where users are added to LDAP tree. The value is pre-pended to the value of <b>Search Base DN</b>. Similarly, <b>Group Suffix</b> specifies the place for groups, <b>Machine Suffix</b> for machines and <b>Idmap Suffix</b> for idmap mappings.</p>"), + + // help for SambaLDAPSettingsTimeoutsWidget + "samba_ldap_settings_timeouts_widget" : _("<p><b>Replication Sleep</b> is the amount of milliseconds Samba will wait after writing to LDAP server, so LDAP replicas can catch up.</p> +<p><b>Time-Out</b> specifies the timeout for LDAP operations (in seconds).</p>"), + + // help for SambaLDAPSettingsSecurityWidget + "samba_ldap_settings_security_widget" : _("<p>Define whether to use SSL for LDAP connection with <b>Use SSL or TLS</b>.</p>"), + + // help for SambaLDAPSettingsMiscWidget + "samba_ldap_settings_misc_widget" : _("<p><b>Delete DN</b> specifies if delete operation deletes the complete LDAP entry or only the Samba specific attributes.</p> +<p>With <b>Synchronize Passwords</b>, define possible synchronization of LDAP password with the NT and LM hashes. See <tt>smb.conf</tt> manual page for details.</p>"), ]; map <string,string> warnings = $[ Modified: trunk/samba-server/src/ldap-widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/ldap-widget.ycp?... ============================================================================== --- trunk/samba-server/src/ldap-widget.ycp (original) +++ trunk/samba-server/src/ldap-widget.ycp Mon Mar 28 13:53:06 2011 @@ -437,9 +437,7 @@ // translators: combo box value list<list> ldap_ssl_values = [ ["Off", _("No")], // translators: combo box value -["Start_tls", _("TLS")], -// translators: combo box value -["On", _("SSL")] ]; +["Start_tls", _("TLS")], ]; void SambaLDAPSettingsSecurityWidgetInit(string key) ``{ init_ldap_combo("ldap ssl", ldap_ssl_values); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org