Attachment 329131 Details for Bug 555579

[patch] patch for /usr/share/YaST2/modules/SambaConfig.pm

SambaConfig.diff (text/plain), 3.33 KB, created by Jiří Suchomel on 2009-11-24 09:50:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2009-11-24 09:50:48 UTC

Size: 3.33 KB

patch

obsolete

>Index: SambaConfig.pm
>===================================================================
>--- SambaConfig.pm	(revision 59610)
>+++ SambaConfig.pm	(working copy)
>@@ -455,14 +455,14 @@
> 	    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; # TODO check for ARRAY?
>+	    $section{parameters}{$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;
>+		$section{parameters}{$key} = $val;
> 	    }
> 	}
> 	push @myconfig, \%section;
>@@ -552,8 +552,8 @@
> 	y2error("undefned key");
> 	return undef;
>     }
>-    $key = lc($key);
>-    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
>+
>     if (exists $InvertedSynonyms{$key}) {
> 	$key = $InvertedSynonyms{$key};
> 	my $val	= $Config{$share}{$key};
>@@ -584,8 +584,7 @@
> 	y2error("undefned key");
> 	return undef;
>     }
>-    $key = lc($key);
>-    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
>     if (exists $InvertedSynonyms{$key}) {
> 	$key = $InvertedSynonyms{$key};
> 	if (defined $Config{$share}{$key}) {
>@@ -621,8 +620,7 @@
> 	return undef;
>     }
>     my $modified = 0;
>-    $key = lc($key);
>-    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
>     my $old = $Config{$share}{$key};
>     if (defined $val) {
> 	if (defined $old && ref ($old) eq "ARRAY" && ref ($val) eq "ARRAY") {
>@@ -652,8 +650,7 @@
> 	y2error("undefned key");
> 	return undef;
>     }
>-    $key = lc($key);
>-    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
>     
>     my $old = $Config{$share}{$key};
>     if (ref ($old) ne "ARRAY") {
>@@ -680,8 +677,7 @@
> 	return undef;
>     }
>     my $modified = 0;
>-    $key = lc($key);
>-    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
>     if (exists $InvertedSynonyms{$key}) {
> 	$key = $InvertedSynonyms{$key};
> 	my $old = toboolean($Config{$share}{$key});
>@@ -1039,8 +1035,7 @@
> 	y2error("undefned key");
> 	return undef;
>     }
>-    $key = lc($key);
>-    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
>     if (defined $WinbindConfig{$share} && defined $WinbindConfig{$share}{$key})
>     {
> 	if (ref $WinbindConfig{$share}{$key} eq "ARRAY") {
>@@ -1063,8 +1058,7 @@
> 	y2error("undefned key");
> 	return undef;
>     }
>-    $key = lc($key);
>-    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
>     
>     my $old = $WinbindConfig{$share}{$key};
>     if (ref ($old) ne "ARRAY") {
>@@ -1090,8 +1084,7 @@
> 	return undef;
>     }
>     my $modified = 0;
>-    $key = lc($key);
>-    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
>     my $old = $WinbindConfig{$share}{$key};
>     if (defined $val) {
> 	    $modified = 1 unless defined $old and $old eq $val;

Actions: View | Diff

Attachments on bug 555579: 328386 | 329129 | 329131