Hello community,
here is the log from the commit of package yast2-samba-server
checked in at Fri Apr 7 17:11:24 CEST 2006.
--------
--- yast2-samba-server/yast2-samba-server.changes 2006-04-06 15:15:45.000000000 +0200
+++ yast2-samba-server/yast2-samba-server.changes 2006-04-07 15:14:52.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 7 15:13:48 CEST 2006 - locilka@suse.cz
+
+- Ask user whether to propose the default configuration when user
+ selects the LDAP support and has no values pre-filled (#163995).
+- 2.13.9
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-2.13.8.tar.bz2
New:
----
yast2-samba-server-2.13.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.RKorbX/_old 2006-04-07 17:11:20.000000000 +0200
+++ /var/tmp/diff_new_pack.RKorbX/_new 2006-04-07 17:11:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-server (Version 2.13.8)
+# spec file for package yast2-samba-server (Version 2.13.9)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-samba-server
-Version: 2.13.8
+Version: 2.13.9
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-server-2.13.8.tar.bz2
+Source0: yast2-samba-server-2.13.9.tar.bz2
prefix: /usr
BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN perl-XML-Writer samba-client update-desktop-files yast2 yast2-devtools yast2-network yast2-perl-bindings yast2-printer yast2-samba-client yast2-testsuite
Requires: yast2-perl-bindings yast2 yast2-ldap-client yast2-samba-client yast2-pam yast2-printer perl-Crypt-SmbHash yast2-ldap yast2-network
@@ -34,7 +34,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-samba-server-2.13.8
+%setup -n yast2-samba-server-2.13.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -68,6 +68,10 @@
%doc %{prefix}/share/doc/packages/yast2-samba-server
%changelog -n yast2-samba-server
+* Fri Apr 07 2006 - locilka@suse.cz
+- Ask user whether to propose the default configuration when user
+ selects the LDAP support and has no values pre-filled (#163995).
+- 2.13.9
* Thu Apr 06 2006 - locilka@suse.cz
- Fixing add_machine.ycp script, SCR::Read() for smb.conf doesn't
return "string" but "list <string>" (#163227)
++++++ yast2-samba-server-2.13.8.tar.bz2 -> yast2-samba-server-2.13.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.13.8/VERSION new/yast2-samba-server-2.13.9/VERSION
--- old/yast2-samba-server-2.13.8/VERSION 2006-04-06 15:15:55.000000000 +0200
+++ new/yast2-samba-server-2.13.9/VERSION 2006-04-07 15:15:03.000000000 +0200
@@ -1 +1 @@
-2.13.8
+2.13.9
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.13.8/configure new/yast2-samba-server-2.13.9/configure
--- old/yast2-samba-server-2.13.8/configure 2006-04-06 15:17:52.000000000 +0200
+++ new/yast2-samba-server-2.13.9/configure 2006-04-07 15:17:11.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-samba-server 2.13.8.
+# Generated by GNU Autoconf 2.59 for yast2-samba-server 2.13.9.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-samba-server'
PACKAGE_TARNAME='yast2-samba-server'
-PACKAGE_VERSION='2.13.8'
-PACKAGE_STRING='yast2-samba-server 2.13.8'
+PACKAGE_VERSION='2.13.9'
+PACKAGE_STRING='yast2-samba-server 2.13.9'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-samba-server 2.13.8 to adapt to many kinds of systems.
+\`configure' configures yast2-samba-server 2.13.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-samba-server 2.13.8:";;
+ short | recursive ) echo "Configuration of yast2-samba-server 2.13.9:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-samba-server configure 2.13.8
+yast2-samba-server configure 2.13.9
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-samba-server $as_me 2.13.8, which was
+It was created by yast2-samba-server $as_me 2.13.9, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-samba-server'
- VERSION='2.13.8'
+ VERSION='2.13.9'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.8"
+VERSION="2.13.9"
RPMNAME="yast2-samba-server"
MAINTAINER="Lukas Ocilka "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-samba-server $as_me 2.13.8, which was
+This file was extended by yast2-samba-server $as_me 2.13.9, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-samba-server config.status 2.13.8
+yast2-samba-server config.status 2.13.9
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.13.8/configure.in new/yast2-samba-server-2.13.9/configure.in
--- old/yast2-samba-server-2.13.8/configure.in 2006-04-06 15:17:48.000000000 +0200
+++ new/yast2-samba-server-2.13.9/configure.in 2006-04-07 15:17:06.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-samba-server, 2.13.8, http://www.suse.de/feedback, yast2-samba-server)
+AC_INIT(yast2-samba-server, 2.13.9, http://www.suse.de/feedback, yast2-samba-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.8"
+VERSION="2.13.9"
RPMNAME="yast2-samba-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.13.8/src/dialogs.ycp new/yast2-samba-server-2.13.9/src/dialogs.ycp
--- old/yast2-samba-server-2.13.8/src/dialogs.ycp 2006-03-13 18:08:14.000000000 +0100
+++ new/yast2-samba-server-2.13.9/src/dialogs.ycp 2006-04-07 15:15:53.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Stanislav Visnovsky
* Lukas Ocilka
*
- * $Id: dialogs.ycp 28909 2006-03-13 16:24:17Z locilka $
+ * $Id: dialogs.ycp 29888 2006-04-07 13:15:35Z locilka $
*/
{
@@ -441,9 +441,13 @@
list<term> domains = [];
- foreach (string key, SambaTrustDom::List(), ``{
- domains = add (domains, `item ( `id(key), key ) );
- });
+ // SambaTrustDom::List() might return 'nil'
+ list <string> samba_trust_domain_list = SambaTrustDom::List();
+ if (samba_trust_domain_list != nil || samba_trust_domain_list != []) {
+ foreach (string key, samba_trust_domain_list, {
+ domains = add (domains, `item ( `id(key), key ) );
+ });
+ }
UI::ReplaceWidget(`id(`domains_tr), `SelectionBox(`id("trusted_domains"), _("&Trusted Domains"), domains));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.13.8/src/ldap-widget.ycp new/yast2-samba-server-2.13.9/src/ldap-widget.ycp
--- old/yast2-samba-server-2.13.8/src/ldap-widget.ycp 2006-03-13 18:08:14.000000000 +0100
+++ new/yast2-samba-server-2.13.9/src/ldap-widget.ycp 2006-04-07 15:15:53.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Martin Lazar
* Lukas Ocilka
*
- * $Id: ldap-widget.ycp 28913 2006-03-13 16:58:09Z locilka $
+ * $Id: ldap-widget.ycp 29888 2006-04-07 13:15:35Z locilka $
*
* This file contains CWM widgets related to Samba LDAP Settings:
* - Samba LDAP Settings Essential Widget
@@ -161,6 +161,18 @@
UI::SetFocus(`id (`passwd1));
}
+void ProposeDefaultValues () {
+ SambaConfig::GlobalSetMap(SambaBackendLDAP::GetSuseDefaultValues());
+ if (Ldap::server != nil && Ldap::server != "") {
+ SambaConfig::GlobalSetStr("idmap backend", "ldap:ldap://" + Ldap::GetFirstServer(Ldap::server));
+ SambaBackend::AddPassdbBackend("ldapsam", "ldap://" + Ldap::GetFirstServer(Ldap::server));
+ } else {
+ SambaConfig::GlobalSetStr("idmap backend", nil);
+ SambaBackend::RemovePassdbBackend("ldapsam");
+ }
+ SambaLDAPSettingsEssentialWidgetInit(nil);
+}
+
symbol SambaLDAPSettingsEssentialWidgetHandle(string key, map event_descr)
{
any id=event_descr["ID"]:nil;
@@ -191,6 +203,26 @@
foreach(any id, ["ldap suffix", "ldap admin dn", `passwd1, `passwd2, `ldap_try_connect, `ldap_advanced_settings], {
UI::ChangeWidget(`id(id), `Enabled, idmap || passdb);
});
+
+ // Propose default values
+ if (passdb || idmap) {
+ boolean some_values_filled = false;
+ foreach (symbol ui_widget_setting, [`passwd1, `passwd2, `ldap_passdb_backend_url, `ldap_passdb_backend_url, `ldap_idmap_backend_url, `ldap_idmap_backend_url], {
+ string read_value = (string) UI::QueryWidget(`id(ui_widget_setting), `Value);
+ if (read_value != "" && read_value != nil) {
+ some_values_filled = true;
+ break;
+ }
+ });
+
+ if (some_values_filled == false && Popup::YesNo(_("All current LDAP-related values will be rewritten.
+Continue?
+")
+ )) {
+ y2milestone("Proposing default values...");
+ ProposeDefaultValues();
+ }
+ }
} else if (id == `ldap_expert_settings) {
SambaLDAPExpertSettingsDialog();
} else if (id == `ldap_try_connect) {
@@ -203,15 +235,7 @@
if (Popup::YesNo(_("All current LDAP-related values will be rewritten.
Continue?
"))) {
- SambaConfig::GlobalSetMap(SambaBackendLDAP::GetSuseDefaultValues());
- if (Ldap::server != nil && Ldap::server != "") {
- SambaConfig::GlobalSetStr("idmap backend", "ldap:ldap://" + Ldap::GetFirstServer(Ldap::server));
- SambaBackend::AddPassdbBackend("ldapsam", "ldap://" + Ldap::GetFirstServer(Ldap::server));
- } else {
- SambaConfig::GlobalSetStr("idmap backend", nil);
- SambaBackend::RemovePassdbBackend("ldapsam");
- }
- SambaLDAPSettingsEssentialWidgetInit(nil);
+ ProposeDefaultValues();
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...