Hello community,
here is the log from the commit of package yast2-samba-server
checked in at Sat Sep 6 05:12:17 CEST 2008.
--------
--- yast2-samba-server/yast2-samba-server.changes 2008-08-05 10:39:00.000000000 +0200
+++ yast2-samba-server/yast2-samba-server.changes 2008-09-05 16:16:55.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Sep 5 16:15:54 CEST 2008 - locilka@suse.cz
+
+- Added WINS Hostname Resolution support (FATE #300971).
+- 2.17.2
+
+-------------------------------------------------------------------
+Thu Sep 4 15:34:33 CEST 2008 - locilka@suse.cz
+
+- Adapted to yast2-ldap API changes (patch created by rhafer)
+ (bnc #422524)
+- Adjusted RPM dependencies.
+- 2.17.1
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-2.17.0.tar.bz2
New:
----
yast2-samba-server-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.kck982/_old 2008-09-06 05:11:44.000000000 +0200
+++ /var/tmp/diff_new_pack.kck982/_new 2008-09-06 05:11:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-server (Version 2.17.0)
+# spec file for package yast2-samba-server (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,20 +19,22 @@
Name: yast2-samba-server
-Version: 2.17.0
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-server-2.17.0.tar.bz2
+Source0: yast2-samba-server-2.17.2.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-ldap-client yast2-perl-bindings yast2-samba-client yast2-testsuite yast2-users
Requires: perl-Crypt-SmbHash
Requires: yast2
+Requires: yast2-ldap >= 2.17.3
Requires: yast2-ldap-client
Requires: yast2-perl-bindings
-# SambaNetJoin::Join
-Requires: yast2-samba-client >= 2.16.5
+Requires: yast2-network
+# Samba::Wins~Name~Resolution
+Requires: yast2-samba-client >= 2.17.1
Requires: yast2-users
# bnc #386473, recommend yast2-samba-server when installaing these packages
Supplements: samba
@@ -52,7 +54,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-samba-server-2.17.0
+%setup -n yast2-samba-server-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +88,14 @@
/usr/share/YaST2/schema/autoyast/rnc/samba-server.rnc
%doc %{prefix}/share/doc/packages/yast2-samba-server
%changelog
+* Fri Sep 05 2008 locilka@suse.cz
+- Added WINS Hostname Resolution support (FATE #300971).
+- 2.17.2
+* Thu Sep 04 2008 locilka@suse.cz
+- Adapted to yast2-ldap API changes (patch created by rhafer)
+ (bnc #422524)
+- Adjusted RPM dependencies.
+- 2.17.1
* Tue Aug 05 2008 locilka@suse.cz
- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)
(FATE #303596).
++++++ yast2-samba-server-2.17.0.tar.bz2 -> yast2-samba-server-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.17.0/configure new/yast2-samba-server-2.17.2/configure
--- old/yast2-samba-server-2.17.0/configure 2008-08-05 10:39:34.000000000 +0200
+++ new/yast2-samba-server-2.17.2/configure 2008-09-05 16:17:18.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-samba-server 2.17.0.
+# Generated by GNU Autoconf 2.61 for yast2-samba-server 2.17.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-samba-server'
PACKAGE_TARNAME='yast2-samba-server'
-PACKAGE_VERSION='2.17.0'
-PACKAGE_STRING='yast2-samba-server 2.17.0'
+PACKAGE_VERSION='2.17.2'
+PACKAGE_STRING='yast2-samba-server 2.17.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.17.0 to adapt to many kinds of systems.
+\`configure' configures yast2-samba-server 2.17.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-samba-server 2.17.0:";;
+ short | recursive ) echo "Configuration of yast2-samba-server 2.17.2:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-samba-server configure 2.17.0
+yast2-samba-server configure 2.17.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.17.0, which was
+It was created by yast2-samba-server $as_me 2.17.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-samba-server'
- VERSION='2.17.0'
+ VERSION='2.17.2'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.0"
+VERSION="2.17.2"
RPMNAME="yast2-samba-server"
MAINTAINER="Lukas Ocilka "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-samba-server $as_me 2.17.0, which was
+This file was extended by yast2-samba-server $as_me 2.17.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-samba-server config.status 2.17.0
+yast2-samba-server config.status 2.17.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.17.0/configure.in new/yast2-samba-server-2.17.2/configure.in
--- old/yast2-samba-server-2.17.0/configure.in 2008-08-05 10:39:30.000000000 +0200
+++ new/yast2-samba-server-2.17.2/configure.in 2008-09-05 16:17:16.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-samba-server, 2.17.0, http://bugs.opensuse.org/, yast2-samba-server)
+AC_INIT(yast2-samba-server, 2.17.2, http://bugs.opensuse.org/, yast2-samba-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.0"
+VERSION="2.17.2"
RPMNAME="yast2-samba-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.17.0/src/dialogs.ycp new/yast2-samba-server-2.17.2/src/dialogs.ycp
--- old/yast2-samba-server-2.17.0/src/dialogs.ycp 2008-04-15 10:35:20.000000000 +0200
+++ new/yast2-samba-server-2.17.2/src/dialogs.ycp 2008-09-05 16:17:08.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Stanislav Visnovsky
* Lukas Ocilka
*
- * $Id: dialogs.ycp 46633 2008-04-15 07:28:54Z jsuchome $
+ * $Id: dialogs.ycp 50759 2008-09-05 14:17:08Z locilka $
*/
{
@@ -70,7 +70,10 @@
boolean confirmAbort() {
y2warning("confirm abort");
- return !SambaServer::GetModified() || Popup::ReallyAbort(true);
+ if (! SambaServer::GetModified())
+ return true;
+
+ return Popup::ReallyAbort (true);
}
@@ -93,7 +96,7 @@
// `ComboBox ( `id( "workgroups" ), `opt( `editable ), _("&Workgroup or Domain Name"), workgroups )
// TRANSLATORS: text entry
- `TextEntry (`id ("workgroups"), _("&Workgroup or Domain Name"), workgroup)
+ `InputField (`id ("workgroups"), `opt (`hstretch), _("&Workgroup or Domain Name"), workgroup)
)
),
`VStretch ()
@@ -228,6 +231,10 @@
UI::ChangeWidget(`id(`dhcp), `Value, Samba::GetDHCP());
}
+void WinsHostResolutionWidgetInit (string key) {
+ UI::ChangeWidget(`id(`wins_dns), `Value, Samba::GetHostsResolution());
+}
+
void GlobalConfigStringWidgetInit(string key)
{
UI::ChangeWidget(`id(key), `Value, SambaConfig::GlobalGetStr(key, ""));
@@ -278,6 +285,15 @@
}
}
+void WinsHostResolutionWidgetStore (string key, map event_descr) {
+ boolean new_value = (boolean) UI::QueryWidget(`id (`wins_dns), `Value);
+ if (new_value != nil) {
+ y2milestone ("Setting WINS Host Resolution '%1' returned '%2'",
+ new_value, Samba::SetHostsResolution (new_value)
+ );
+ }
+}
+
void GlobalConfigStringWidgetStore(string key, map event_descr)
{
string value = (string)UI::QueryWidget(`id(key), `Value);
@@ -382,13 +398,13 @@
35,
`VBox (
// TRANSLATORS: text entry
- `TextEntry (`id ("share_name"), `opt(`hstretch), _("New Share &Name"), share)
+ `InputField (`id ("share_name"), `opt(`hstretch), _("New Share &Name"), share)
)
)),
`VSpacing (1),
- `HBox (
- `PushButton (`id (`ok), Label::OKButton()),
- `PushButton (`id (`cancel), Label::CancelButton())
+ `ButtonBox (
+ `PushButton (`id (`ok), `opt (`okButton), Label::OKButton()),
+ `PushButton (`id (`cancel), `opt (`cancelButton), Label::CancelButton())
)
);
@@ -516,12 +532,12 @@
{
//rwalter I couldn't make this one show up. Please make sure my deletions didn't make it too confusing.
term contents = `VBox (
- `TextEntry (`id(`domain), _("Trusted &Domain") ),
+ `InputField (`id(`domain), `opt (`hstretch), _("Trusted &Domain")),
`Password (`id(`password), _("&Password") ),
`VSpacing (1),
`HBox (
- `PushButton (`id (`ok), `opt (`default), Label::OKButton () ),
- `PushButton (`id (`cancel), Label::CancelButton () )
+ `PushButton (`id (`ok), `opt (`default), Label::OKButton ()),
+ `PushButton (`id (`cancel), Label::CancelButton ())
)
);
@@ -671,8 +687,8 @@
`VBox(`opt(`hstretch),
`VSpacing(1),
`Frame(_("Identification"), `VBox(
- `TextEntry(`id(`name), _("Share &Name")),
- `TextEntry(`id(`comment), _("Share &Description")))),
+ `InputField (`id(`name), `opt (`hstretch), _("Share &Name")),
+ `InputField (`id(`comment), `opt (`hstretch), _("Share &Description")))),
`Frame(_("Share Type"), `HBox(
`HSpacing ( 1 ),
`VBox(`opt(`hstretch ),
@@ -825,9 +841,11 @@
`HSpacing(1)
);
- // TRANSLATORS: check box
term wins_via_dhcp = DHCPSupportTerm (Samba::GetDHCP());
+ // TRANSLATORS: check box
+ term wins_host_resolution = `Left (`CheckBox (`id (`wins_dns), _("Use WINS for Hostname Resolution")));
+
list<term> roles = [
// translators: combobox item
`item(`id("STANDALONE"), _("Not a DC")),
@@ -845,7 +863,7 @@
`VBox(
// `ComboBox(`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name"),
// SambaNmbLookup::GetAvailableNeighbours(nil)),
- `TextEntry (`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name")),
+ `InputField (`id("workgroup_domainname"), `opt(`hstretch), _("&Workgroup or Domain Name")),
// translators: combobox label
`ComboBox(`id("domain_controller"), `opt(`hstretch), _("Domain &Controller"), roles),
`VStretch()
@@ -920,6 +938,7 @@
`VSpacing (1),
"netbios name",
"WINS via DHCP",
+ "WINS Host Resolution",
"ADVANCED SETTINGS"
)
),
@@ -940,6 +959,7 @@
`Frame (_("WINS"), `VBox (
"WINS SETTINGS",
`HBox (`HSpacing (1), "WINS via DHCP"),
+ `HBox (`HSpacing (1), "WINS Host Resolution"),
`VStretch()
))
)
@@ -959,7 +979,7 @@
),
`HWeight(1, `Empty())
),
- "widget_names": ["IDENTITY COMMON HELP", "BASE SETTINGS", "WINS SETTINGS", "WINS via DHCP", "netbios name", "ADVANCED SETTINGS"]
+ "widget_names": ["IDENTITY COMMON HELP", "BASE SETTINGS", "WINS SETTINGS", "WINS via DHCP", "WINS Host Resolution", "netbios name", "ADVANCED SETTINGS"]
]
];
@@ -1010,7 +1030,7 @@
"WINS SETTINGS": $[
"widget" : `custom,
"custom_widget" : wins_widget,
- "help": HELPS["smb_conf_tab_wins_settings"]:"",
+ "help": HostsResolutionHelp(),
"init": WinsSettingsWidgetInit,
"store": WinsSettingsWidgetStore,
"handle": WinsSettingsWidgetHandle,
@@ -1022,6 +1042,13 @@
"init": WinsViaDHCPWidgetInit,
"store": WinsViaDHCPWidgetStore,
],
+ "WINS Host Resolution" : $[
+ "widget" : `custom,
+ "custom_widget" : wins_host_resolution,
+ "help" : HELPS["smb_conf_tab_wins_host_resolution"]:"",
+ "init": WinsHostResolutionWidgetInit,
+ "store": WinsHostResolutionWidgetStore,
+ ],
"netbios name": $[
"widget": `textentry,
"label": _("NetBIOS &Hostname"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.17.0/src/SambaBackendLDAP.pm new/yast2-samba-server-2.17.2/src/SambaBackendLDAP.pm
--- old/yast2-samba-server-2.17.0/src/SambaBackendLDAP.pm 2008-08-05 10:39:17.000000000 +0200
+++ new/yast2-samba-server-2.17.2/src/SambaBackendLDAP.pm 2008-09-04 15:41:21.000000000 +0200
@@ -3,7 +3,7 @@
# Authors: Stanislav Visnovsky
# Martin Lazar
#
-# $Id: SambaBackendLDAP.pm 49671 2008-08-05 08:39:17Z locilka $
+# $Id: SambaBackendLDAP.pm 50690 2008-09-04 13:41:21Z locilka $
#
# Representation of the configuration of samba-server.
# Input and output routines.
@@ -167,7 +167,6 @@
}
return unless DNS->IsHostLocal($url->{host});
- my $restart_server;
my $suffix = SambaConfig->GlobalGetStr("ldap suffix", "");
my $admin_dn = SambaConfig->GlobalGetStr("ldap admin dn", "");
@@ -176,8 +175,6 @@
if (not defined $ret) {
y2error("Add LDAP Samba3 schema failed");
return;
- } elsif ($ret) {
- $restart_server = 1;
}
# add indices
@@ -186,26 +183,15 @@
if (not defined $ret) {
y2error("Add Index '$_' failed");
return;
- } elsif ($ret) {
- $restart_server = 1;
}
}
# setup ACLs
if ($admin_dn) {
- $ret = LdapServerAccess->AddSambaACLHack($admin_dn, 0);
+ $ret = LdapServerAccess->AddSambaACL($admin_dn, $suffix);
if (not defined $ret) {
- y2error("Samba ACL Hack failed");
+ y2error("adding Samba ACLs failed");
return;
- } elsif ($ret) {
- $restart_server = 1;
- }
- }
-
- # restart server if running
- if ($restart_server && not Service->Status("ldap")) {
- unless (Service->Restart("ldap")) {
- y2error("Error when restarting service 'ldap'");
}
}
}
@@ -326,8 +312,8 @@
y2milestone("Creating dn: $dn");
my $map;
given($attr) {
- when ("dc") {$map = {objectClass => ["top", "dcobject"], dc => $value}}
- when ("ou") {$map = {objectClass => ["top", "organizationalunit"], ou => $value}}
+ when ("dc") {$map = {objectClass => ["top", "dcObject"], dc => $value}}
+ when ("ou") {$map = {objectClass => ["top", "organizationalUnit"], ou => $value}}
# translators: error message, followed by class giving error
default {return __("Unknown Class:")." $dn\n".__("Only dcObject (dc) and organizationalUnit (ou) classes are supported.")}
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.17.0/src/SambaServer.pm new/yast2-samba-server-2.17.2/src/SambaServer.pm
--- old/yast2-samba-server-2.17.0/src/SambaServer.pm 2008-05-06 11:21:52.000000000 +0200
+++ new/yast2-samba-server-2.17.2/src/SambaServer.pm 2008-09-05 16:17:08.000000000 +0200
@@ -5,7 +5,7 @@
# Martin Lazar
# Lukas Ocilka
#
-# $Id: SambaServer.pm 47310 2008-05-06 09:21:52Z locilka $
+# $Id: SambaServer.pm 50759 2008-09-05 14:17:08Z locilka $
#
# Representation of the configuration of samba-server.
# Input and output routines.
@@ -249,6 +249,9 @@
# PackageSystem->CheckAndInstallPackagesInteractive(["samba-pdb"]) or return 0;
# }
+ y2milestone ("Writing WINS Host Resolution=", Samba->GetHostsResolution());
+ Samba->WriteHostsResolution();
+
if (!SambaConfig->Write($write_only)) {
# /etc/samba/smb.conf is filename
Report->Error(__("Cannot write settings to /etc/samba/smb.conf."));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.17.0/VERSION new/yast2-samba-server-2.17.2/VERSION
--- old/yast2-samba-server-2.17.0/VERSION 2008-08-05 10:39:09.000000000 +0200
+++ new/yast2-samba-server-2.17.2/VERSION 2008-09-05 16:17:01.000000000 +0200
@@ -1 +1 @@
-2.17.0
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org