Hello community,
here is the log from the commit of package yast2-samba-server
checked in at Thu Apr 12 17:06:22 CEST 2007.
--------
--- yast2-samba-server/yast2-samba-server.changes 2007-03-21 12:29:48.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-samba-server/yast2-samba-server.changes 2007-04-11 16:07:28.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Apr 11 15:43:45 CEST 2007 - locilka@suse.cz
+
+- Changing SambaServer functions to use only one "passdb backend"
+ for the configuration (#245167).
+- Adjusted testsuites.
+- 2.15.5
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-2.15.4.tar.bz2
New:
----
yast2-samba-server-2.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.P26791/_old 2007-04-12 17:06:04.000000000 +0200
+++ /var/tmp/diff_new_pack.P26791/_new 2007-04-12 17:06:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-server (Version 2.15.4)
+# spec file for package yast2-samba-server (Version 2.15.5)
#
# Copyright (c) 2007 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.15.4
+Version: 2.15.5
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-server-2.15.4.tar.bz2
+Source0: yast2-samba-server-2.15.5.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
@@ -41,7 +41,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-samba-server-2.15.4
+%setup -n yast2-samba-server-2.15.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,11 @@
%doc %{prefix}/share/doc/packages/yast2-samba-server
%changelog
+* Wed Apr 11 2007 - locilka@suse.cz
+- Changing SambaServer functions to use only one "passdb backend"
+ for the configuration (#245167).
+- Adjusted testsuites.
+- 2.15.5
* Wed Mar 21 2007 - locilka@suse.cz
- Set SambaRole only when changed by user. This avoids rewriting
changed made in Expert Settings (255824).
++++++ yast2-samba-server-2.15.4.tar.bz2 -> yast2-samba-server-2.15.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.15.4/src/SambaBackend.pm new/yast2-samba-server-2.15.5/src/SambaBackend.pm
--- old/yast2-samba-server-2.15.4/src/SambaBackend.pm 2006-10-09 15:51:00.000000000 +0200
+++ new/yast2-samba-server-2.15.5/src/SambaBackend.pm 2007-04-11 15:48:49.000000000 +0200
@@ -3,7 +3,7 @@
# Authors: Stanislav Visnovsky
# Martin Lazar
#
-# $Id: SambaBackend.pm 22575 2005-03-15 10:25:01Z mlazar $
+# $Id: SambaBackend.pm 37398 2007-04-11 13:48:47Z locilka $
#
# Representation of the configuration of samba-server.
# Input and output routines.
@@ -44,7 +44,26 @@
BEGIN{$TYPEINFO{GetPassdbBackends}=["function",["list","string"]]}
sub GetPassdbBackends {
my ($self) = @_;
- return [ split " ", SambaConfig->GlobalGetStr("passdb backend", "smbpasswd") ];
+
+ my @current = split (" ", SambaConfig->GlobalGetStr("passdb backend", "smbpasswd"));
+ my $backends_found = -1;
+ my @ret;
+
+ # only the first backend can be used
+ # bugzilla #245167
+ foreach my $one (@current) {
+ my $is_backend = $one;
+ $is_backend =~ s/^([^:]+)(:.*)*$/$1/;
+ if (defined $AvailableBackends{$is_backend}) {
+ ++$backends_found;
+ }
+
+ if ($backends_found <= 0) {
+ push @ret, $one;
+ }
+ }
+
+ return \@ret;
}
BEGIN{$TYPEINFO{GetLocation}=["function","string","string"]}
@@ -75,13 +94,34 @@
y2warning("Unknown or unsupported backend '$name'");
}
}
+
foreach (keys %toDisable) {
$AvailableBackends{$_}->PassdbDisable($_) or $failed++;
}
+
foreach (@toEnable) {
$_->{backend}->PassdbEnable($_->{name}, $_->{location}) or $failed++;
}
- SambaConfig->GlobalSetStr("passdb backend", join(" ", @$backends));
+
+ my $backends_found = -1;
+ my @write;
+
+ # only the first backend can be used
+ # bugzilla #245167
+ foreach my $one (@{$backends}) {
+ my $is_backend = $one;
+ $is_backend =~ s/^([^:]+)(:.*)*$/$1/;
+ if (defined $AvailableBackends{$is_backend}) {
+ ++$backends_found;
+ }
+
+ if ($backends_found <= 0) {
+ push @write, $one;
+ }
+ }
+
+ # use only the first passdb
+ SambaConfig->GlobalSetStr ("passdb backend", join (" ", @write));
return $failed==0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.15.4/src/SambaServer.pm new/yast2-samba-server-2.15.5/src/SambaServer.pm
--- old/yast2-samba-server-2.15.4/src/SambaServer.pm 2006-10-09 15:51:00.000000000 +0200
+++ new/yast2-samba-server-2.15.5/src/SambaServer.pm 2007-04-11 15:48:49.000000000 +0200
@@ -5,7 +5,7 @@
# Martin Lazar
# Lukas Ocilka
#
-# $Id: SambaServer.pm 28913 2006-03-13 16:58:09Z locilka $
+# $Id: SambaServer.pm 37398 2007-04-11 13:48:47Z locilka $
#
# Representation of the configuration of samba-server.
# Input and output routines.
@@ -89,34 +89,38 @@
my $caption = __("Initializing Samba Server Configuration");
# We do not set help text here, because it was set outside
- Progress->New($caption, " ", 6, [
- # translators: progress stage 1/6
+ Progress->New($caption, " ", 7, [
+ # translators: progress stage
__("Read global Samba settings"),
- # translators: progress stage 2/6
+ # translators: progress stage
__("Read Samba secrets"),
- # translators: progress stage 3/6
+ # translators: progress stage
__("Read Samba service settings"),
- # translators: progress stage 4/6
+ # translators: progress stage
__("Read Samba accounts"),
- # translators: progress stage 5/6
+ # translators: progress stage
__("Read the back-end settings"),
- # translators: progress stage 6/6
- __("Read the firewall settings")
+ # translators: progress stage
+ __("Read the firewall settings"),
+ # translators: progress stage
+ __("Read Samba service role settings"),
], [
- # translators: progress step 1/6
+ # translators: progress step
__("Reading global Samba settings..."),
- # translators: progress step 2/6
+ # translators: progress step
__("Reading Samba secrets..."),
- # translators: progress step 3/6
+ # translators: progress step
__("Reading Samba service settings..."),
- # translators: progress step 4/6
+ # translators: progress step
__("Reading Samba accounts..."),
- # translators: progress step 5/6
+ # translators: progress step
__("Reading the back-end settings..."),
- # translators: progress step 6/6
+ # translators: progress step
__("Reading the firewall settings..."),
+ # translators: progress stage
+ __("Reading Samba service role settings..."),
# translators: progress finished
- __("Finished")
+ __("Finished"),
],
""
);
@@ -153,16 +157,18 @@
my $po = Progress->set(0);
SuSEFirewall->Read();
Progress->set($po);
-# if(Abort()) return false;
- # Read finished
+ # 7: Read other settings
Progress->NextStage();
$Modified = 0;
-
+
$GlobalsConfigured = $self->Configured();
y2milestone("Service:". (SambaService->GetServiceAutoStart() ? "Enabled" : "Disabled"));
y2milestone("Role:". SambaRole->GetRoleName());
+
+ # Reading finished
+ Progress->Finish();
return 1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.15.4/testsuite/YaPI/tests/YaPI-AddSAM-2.out new/yast2-samba-server-2.15.5/testsuite/YaPI/tests/YaPI-AddSAM-2.out
--- old/yast2-samba-server-2.15.4/testsuite/YaPI/tests/YaPI-AddSAM-2.out 2006-10-09 15:51:02.000000000 +0200
+++ new/yast2-samba-server-2.15.5/testsuite/YaPI/tests/YaPI-AddSAM-2.out 2007-04-11 16:04:41.000000000 +0200
@@ -27,7 +27,7 @@
Write .etc.smb.value_type.global."ldap user suffix" [0] true
Write .etc.smb.value.global."local master" ["no"] true
Write .etc.smb.value_type.global."local master" [0] true
-Write .etc.smb.value.global."passdb backend" ["smbpasswd ldapsam:ldap://localhost smbpasswd:/var/lib/smbusers"] true
+Write .etc.smb.value.global."passdb backend" ["smbpasswd"] true
Write .etc.smb.value_type.global."passdb backend" [0] true
Write .etc.smb.value.global."preferred master" ["yes"] true
Write .etc.smb.value_type.global."preferred master" [0] true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.15.4/testsuite/YaPI/tests/YaPI-AddSAM.out new/yast2-samba-server-2.15.5/testsuite/YaPI/tests/YaPI-AddSAM.out
--- old/yast2-samba-server-2.15.4/testsuite/YaPI/tests/YaPI-AddSAM.out 2006-10-09 15:51:02.000000000 +0200
+++ new/yast2-samba-server-2.15.5/testsuite/YaPI/tests/YaPI-AddSAM.out 2007-04-11 16:05:56.000000000 +0200
@@ -27,7 +27,7 @@
Write .etc.smb.value_type.global."ldap user suffix" [0] true
Write .etc.smb.value.global."local master" ["no"] true
Write .etc.smb.value_type.global."local master" [0] true
-Write .etc.smb.value.global."passdb backend" ["smbpasswd:/var/lib/smbusers smbpasswd ldapsam:ldap://localhost"] true
+Write .etc.smb.value.global."passdb backend" ["smbpasswd:/var/lib/smbusers"] true
Write .etc.smb.value_type.global."passdb backend" [0] true
Write .etc.smb.value.global."preferred master" ["yes"] true
Write .etc.smb.value_type.global."preferred master" [0] true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.15.4/testsuite/YaPI/tests/YaPI-EditDefaultSAM.out new/yast2-samba-server-2.15.5/testsuite/YaPI/tests/YaPI-EditDefaultSAM.out
--- old/yast2-samba-server-2.15.4/testsuite/YaPI/tests/YaPI-EditDefaultSAM.out 2006-10-09 15:51:02.000000000 +0200
+++ new/yast2-samba-server-2.15.5/testsuite/YaPI/tests/YaPI-EditDefaultSAM.out 2007-04-11 16:06:27.000000000 +0200
@@ -27,7 +27,7 @@
Write .etc.smb.value_type.global."ldap user suffix" [0] true
Write .etc.smb.value.global."local master" ["no"] true
Write .etc.smb.value_type.global."local master" [0] true
-Write .etc.smb.value.global."passdb backend" ["ldapsam:ldap://localhost smbpasswd"] true
+Write .etc.smb.value.global."passdb backend" ["ldapsam:ldap://localhost"] true
Write .etc.smb.value_type.global."passdb backend" [0] true
Write .etc.smb.value.global."preferred master" ["yes"] true
Write .etc.smb.value_type.global."preferred master" [0] true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.15.4/VERSION new/yast2-samba-server-2.15.5/VERSION
--- old/yast2-samba-server-2.15.4/VERSION 2007-03-21 12:29:54.000000000 +0100
+++ new/yast2-samba-server-2.15.5/VERSION 2007-04-11 15:47:42.000000000 +0200
@@ -1 +1 @@
-2.15.4
+2.15.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org