Attachment 60955 Details for Bug 138555

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

SambaConfig.diff (text/plain), 3.85 KB, created by Jiří Suchomel on 2005-12-15 10:31:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2005-12-15 10:31:35 UTC

Size: 3.85 KB

patch

obsolete

>Index: SambaConfig.pm
>===================================================================
>--- SambaConfig.pm	(revision 26259)
>+++ SambaConfig.pm	(working copy)
>@@ -168,10 +168,20 @@
> 	    next if $line->{kind} ne "value";
> 	    next if $line->{type} and not $section->{type}; # commented line
> 
>-	    $self->ShareSetStr($share, $line->{name}, $line->{value});
>+	    if (defined $Config{$share}{$line->{name}}) {
>+		y2internal ("key '".$line->{name}."' already present");
>+		y2internal ("original value: ", $Config{$share}{$line->{name}});
>+		y2internal ("current  value: ", $line->{value});
>+		$self->ShareAddStr($share, $line->{name}, $line->{value});
>+	    }
>+	    else {
>+		$self->ShareSetStr($share, $line->{name}, $line->{value});
>+	    }
> 	}
>     }
>     $self->UnsetModified();
>+
>+y2warning ("global section read:", Dumper ($Config{"global"}));
>     
>     y2debug("Readed config: ".Dumper(\%Config));
>     return 1;
>@@ -194,14 +204,18 @@
> 	    if (!defined $val) {
> 		SCR->Write(".etc.smb.value.global.$key", undef);
> 	    } else {
>-	        SCR->Write(".etc.smb.value.global.$key", String($val));
>+		if (ref ($val) ne "ARRAY") {
>+		    $val = [ String($val) ];
>+		}
>+	        SCR->Write(".etc.smb.value.global.$key", $val);
>+#	        SCR->Write(".etc.smb.value.global.$key", String($val));
> 	        # ensure option is not commented
>-		SCR->Write(".etc.smb.value_type.global.$key", Integer(0));
>+		SCR->Write(".etc.smb.value_type.global.$key", [Integer(0)]);
> 	    }
> 	}
> 
> 	# ensure global section is not commented
>-	SCR->Write(".etc.smb.section_type.global", Integer(0));
>+	SCR->Write(".etc.smb.section_type.global", [Integer(0)]);
> 	
> 	# remove modified flag
> 	$Config{global}{_modified} = undef;
>@@ -230,13 +244,17 @@
> 	    if (!defined $val) {
> 		SCR->Write(".etc.smb.value.$share.$key", undef);
> 	    } else {
>-	        my $ret1 = SCR->Write(".etc.smb.value.$share.$key", String($val));
>-	        my $ret  = SCR->Write(".etc.smb.value_type.$share.$key", Integer($commentout));
>+		if (ref ($val) ne "ARRAY") {
>+		    $val = [ String($val) ];
>+		}
>+#	        my $ret1 = SCR->Write(".etc.smb.value.$share.$key", String($val));
>+	        my $ret1 = SCR->Write(".etc.smb.value.$share.$key", $val);
>+	        my $ret  = SCR->Write(".etc.smb.value_type.$share.$key", [ Integer($commentout)]);
> 	    }
> 	};
> 	
> 	# write the type and comment of the section
>-	SCR->Write(".etc.smb.section_type.$share", Integer($commentout));
>+	SCR->Write(".etc.smb.section_type.$share", [Integer($commentout)]);
> 	my $comment = $Config{$share}{_comment} || "";
> 	$comment =~ s/\n*$//;
> 	$comment =~ s/^\n*//;
>@@ -245,7 +263,7 @@
> 	}
> 	$comment =~ s/^(?![#;])/; /mg if $comment;
> 	$comment .= "\n" if $comment;
>-	SCR->Write(".etc.smb.section_comment.$share", String("\n$comment"));
>+	SCR->Write(".etc.smb.section_comment.$share", [String("\n$comment")]);
> 
> 	# remove modified flag
> 	$Config{$share}{_modified} = undef;
>@@ -384,6 +402,35 @@
>     return defined $Config{$share}{$key} ? $Config{$share}{$key} : $default;
> }
> 
>+# add share key value
>+# FIXME (not possible for InvertedSynonyms, no deleting, no checking for changes
>+BEGIN{ $TYPEINFO{ShareAddStr} = ["function", "boolean", "string", "string", "string"]; }
>+sub ShareAddStr {
>+    my ($self, $share, $key, $val) = @_;
>+    if (not defined $share) {
>+	y2error("undefned share");
>+	return undef;
>+    }
>+    if (not defined $key) {
>+	y2error("undefned key");
>+	return undef;
>+    }
>+    $key = lc($key);
>+    $key = $Synonyms{$key} if exists $Synonyms{$key};
>+    
>+    my $old = $Config{$share}{$key};
>+    if (ref ($old) ne "ARRAY") {
>+	$Config{$share}{$key} = [];
>+	if (defined $old) {
>+	    push @{$Config{$share}{$key}}, $old;
>+	}
>+    }
>+    push @{$Config{$share}{$key}}, $val;
>+
>+    $self->ShareSetModified($share);
>+    return 1;
>+}
>+
> # set share key value, return old value
> BEGIN{ $TYPEINFO{ShareSetStr} = ["function", "boolean", "string", "string", "string"]; }
> sub ShareSetStr {

Actions: View | Diff

Attachments on bug 138555: 60954 | 60955