Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Wed Apr 19 23:34:55 CEST 2006.
--------
--- yast2-samba-client/yast2-samba-client.changes 2006-04-19 10:41:56.000000000 +0200
+++ NOARCH/yast2-samba-client/yast2-samba-client.changes 2006-04-19 16:39:13.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 19 16:28:21 CEST 2006 - jsuchome@suse.cz
+
+- fixed Import/Export for keys in /etc/security/pam_winbind.conf
+- 2.13.17
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.13.16.tar.bz2
New:
----
yast2-samba-client-2.13.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.b1WqMB/_old 2006-04-19 23:33:31.000000000 +0200
+++ /var/tmp/diff_new_pack.b1WqMB/_new 2006-04-19 23:33:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.13.16)
+# spec file for package yast2-samba-client (Version 2.13.17)
#
# 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-client
-Version: 2.13.16
-Release: 1
+Version: 2.13.17
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.13.16.tar.bz2
+Source0: yast2-samba-client-2.13.17.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-pam yast2-kerberos-client
@@ -34,7 +34,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-samba-client-2.13.16
+%setup -n yast2-samba-client-2.13.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -72,6 +72,9 @@
%changelog -n yast2-samba-client
* Wed Apr 19 2006 - jsuchome@suse.cz
+- fixed Import/Export for keys in /etc/security/pam_winbind.conf
+- 2.13.17
+* Wed Apr 19 2006 - jsuchome@suse.cz
- skip reading of pam_winbind if it was read before
(-> and fix the failing testsuite of yast2-samba-server)
- 2.13.16
++++++ yast2-samba-client-2.13.16.tar.bz2 -> yast2-samba-client-2.13.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.16/VERSION new/yast2-samba-client-2.13.17/VERSION
--- old/yast2-samba-client-2.13.16/VERSION 2006-04-19 10:28:18.000000000 +0200
+++ new/yast2-samba-client-2.13.17/VERSION 2006-04-19 16:28:42.000000000 +0200
@@ -1 +1 @@
-2.13.16
+2.13.17
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.16/agents/etc_security_winbind.scr new/yast2-samba-client-2.13.17/agents/etc_security_winbind.scr
--- old/yast2-samba-client-2.13.16/agents/etc_security_winbind.scr 2006-04-13 13:52:52.000000000 +0200
+++ new/yast2-samba-client-2.13.17/agents/etc_security_winbind.scr 2006-04-19 15:43:37.000000000 +0200
@@ -26,7 +26,7 @@
// we need to exclude ; because of the second matching rule
"params" : [
$[
- "match" : [ "^[ \t]*([a-z:_ ]*[a-z])[ \t]*=[ \t]*(.*[^ \t])[ \t]*$" , "\t%s = %s"],
+ "match" : [ "^[ \t]*([a-z:_0-9 ]*[a-z])[ \t]*=[ \t]*(.*[^ \t])[ \t]*$" , "\t%s = %s"],
], $[
// this is a special type for commenting out the values
// "match" : [ "^[;#]+[ \t]*([a-z ]*[a-z])[ \t]*=[ \t]*(.*[^ \t])[ \t]*$" , "#\t%s = %s"],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.16/src/SambaConfig.pm new/yast2-samba-client-2.13.17/src/SambaConfig.pm
--- old/yast2-samba-client-2.13.16/src/SambaConfig.pm 2006-04-19 10:27:08.000000000 +0200
+++ new/yast2-samba-client-2.13.17/src/SambaConfig.pm 2006-04-19 16:24:35.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: Manage samba configuration data (smb.conf).
# Authors: Martin Lazar
#
-# $Id: SambaConfig.pm 30190 2006-04-18 15:10:14Z jsuchome $
+# $Id: SambaConfig.pm 30222 2006-04-19 08:42:27Z jsuchome $
#
# Functions for acess to samba configuration file. It provide
# unified acces to configuration keys including aliases and other
@@ -76,6 +76,14 @@
"writable" => "read only",
);
+# keys in /etc/security/pam_winbind.conf
+my %winbind_params = (
+ "cached_login" => 1,
+ "krb5_auth" => 1,
+ "krb5_ccache_type" => 1,
+ "require_membership_of" => 1
+);
+
###########################################################################
# helper functions
@@ -434,9 +442,17 @@
while(my ($key, $val) = each %{$Config{$share}}) {
next unless defined $val; # skip undefined values
next if $key =~ /^_/; # skip internal keys
- $key =~ tr/a-zA-Z/_/cs;
+ $key =~ tr/a-zA-Z0-9/_/cs;
$section{parameters}{lc $key} = $val; # TODO check for ARRAY?
}
+ if (defined $WinbindConfig{$share}) {
+ while(my ($key, $val) = each %{$WinbindConfig{$share}}) {
+ next unless defined $val; # skip undefined values
+ next if $key =~ /^_/; # skip internal keys
+ $key =~ tr/a-zA-Z0-9/_/cs;
+ $section{parameters}{lc $key} = $val;
+ }
+ }
push @myconfig, \%section;
}
return \@myconfig;
@@ -447,7 +463,7 @@
sub Import {
my ($self, $config) = @_;
%Config = ();
- %WinbindConfig = (); #FIXME fill WinbindConfig
+ %WinbindConfig = ();
if ($config && ref $config eq "ARRAY") { # normal import
foreach my $section (@$config) {
my $name = $section->{name};
@@ -455,8 +471,13 @@
$self->ShareSetComment($name, $section->{comment}) if $section->{comment};
$self->ShareDisable($name) if $section->{disabled};
while(my ($key, $val) = each %{$section->{parameters}}) {
- $key =~ tr/_/ /;
- $self->ShareSetStr($name, $key, $val);
+ if (exists $winbind_params{$key}) {
+ $self->WinbindShareSetStr($name, $key, $val);
+ }
+ else {
+ $key =~ tr/_/ /;
+ $self->ShareSetStr($name, $key, $val);
+ }
}
}
$self->UnsetModified();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...