Attachment #329131 for bug #555579

View | Details | Raw Unified | Return to bug 555579
Collapse All | Expand All




	    next unless defined $val;	# skip undefined values
	    next if $key =~ /^_/;	# skip internal keys
	    $key =~ tr/a-zA-Z0-9/_/cs;
	    $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}{$key} = $val;
	    }
	}
	push @myconfig, \%section;

	y2error("undefned key");
	return undef;
    }
    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};

    if (exists $InvertedSynonyms{$key}) {
	$key = $InvertedSynonyms{$key};
	my $val	= $Config{$share}{$key};

	y2error("undefned key");
	return undef;
    }
    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
    $key = $Synonyms{$key} if exists $Synonyms{$key};
    if (exists $InvertedSynonyms{$key}) {
	$key = $InvertedSynonyms{$key};
	if (defined $Config{$share}{$key}) {

	return undef;
    }
    my $modified = 0;
    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
    $key = $Synonyms{$key} if exists $Synonyms{$key};
    my $old = $Config{$share}{$key};
    if (defined $val) {
	if (defined $old && ref ($old) eq "ARRAY" && ref ($val) eq "ARRAY") {

	y2error("undefned key");
	return undef;
    }
    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
    $key = $Synonyms{$key} if exists $Synonyms{$key};
    
    my $old = $Config{$share}{$key};
    if (ref ($old) ne "ARRAY") {

	return undef;
    }
    my $modified = 0;
    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
    $key = $Synonyms{$key} if exists $Synonyms{$key};
    if (exists $InvertedSynonyms{$key}) {
	$key = $InvertedSynonyms{$key};
	my $old = toboolean($Config{$share}{$key});

	y2error("undefned key");
	return undef;
    }
    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
    $key = $Synonyms{$key} if exists $Synonyms{$key};
    if (defined $WinbindConfig{$share} && defined $WinbindConfig{$share}{$key})
    {
	if (ref $WinbindConfig{$share}{$key} eq "ARRAY") {

	y2error("undefned key");
	return undef;
    }
    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
    $key = $Synonyms{$key} if exists $Synonyms{$key};
    
    my $old = $WinbindConfig{$share}{$key};
    if (ref ($old) ne "ARRAY") {

	return undef;
    }
    my $modified = 0;
    $key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
    $key = $Synonyms{$key} if exists $Synonyms{$key};
    my $old = $WinbindConfig{$share}{$key};
    if (defined $val) {
	    $modified = 1 unless defined $old and $old eq $val;

Return to bug 555579

Lines 455-468 Link Here

(-)SambaConfig.pm (-18 / +11 lines)
455	next unless defined $val; # skip undefined values	455	next unless defined $val; # skip undefined values
456	next if $key =~ /^_/; # skip internal keys	456	next if $key =~ /^_/; # skip internal keys
457	$key =~ tr/a-zA-Z0-9/_/cs;	457	$key =~ tr/a-zA-Z0-9/_/cs;
458	$section{parameters}{lc $key} = $val; # TODO check for ARRAY?	458	$section{parameters}{$key} = $val; # TODO check for ARRAY?
459	}	459	}
460	if (defined $WinbindConfig{$share}) {	460	if (defined $WinbindConfig{$share}) {
461	while(my ($key, $val) = each %{$WinbindConfig{$share}}) {	461	while(my ($key, $val) = each %{$WinbindConfig{$share}}) {
462	next unless defined $val; # skip undefined values	462	next unless defined $val; # skip undefined values
463	next if $key =~ /^_/; # skip internal keys	463	next if $key =~ /^_/; # skip internal keys
464	$key =~ tr/a-zA-Z0-9/_/cs;	464	$key =~ tr/a-zA-Z0-9/_/cs;
465	$section{parameters}{lc $key} = $val;	465	$section{parameters}{$key} = $val;
466	}	466	}
467	}	467	}
468	push @myconfig, \%section;	468	push @myconfig, \%section;
Lines 552-559 Link Here
552	y2error("undefned key");	552	y2error("undefned key");
553	return undef;	553	return undef;
554	}	554	}
555	$key = lc($key);	555	$key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
556	$key = $Synonyms{$key} if exists $Synonyms{$key};	556
557	if (exists $InvertedSynonyms{$key}) {	557	if (exists $InvertedSynonyms{$key}) {
558	$key = $InvertedSynonyms{$key};	558	$key = $InvertedSynonyms{$key};
559	my $val = $Config{$share}{$key};	559	my $val = $Config{$share}{$key};
Lines 584-591 Link Here
584	y2error("undefned key");	584	y2error("undefned key");
585	return undef;	585	return undef;
586	}	586	}
587	$key = lc($key);	587	$key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
588	$key = $Synonyms{$key} if exists $Synonyms{$key};
589	if (exists $InvertedSynonyms{$key}) {	588	if (exists $InvertedSynonyms{$key}) {
590	$key = $InvertedSynonyms{$key};	589	$key = $InvertedSynonyms{$key};
591	if (defined $Config{$share}{$key}) {	590	if (defined $Config{$share}{$key}) {
Lines 621-628 Link Here
621	return undef;	620	return undef;
622	}	621	}
623	my $modified = 0;	622	my $modified = 0;
624	$key = lc($key);	623	$key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
625	$key = $Synonyms{$key} if exists $Synonyms{$key};
626	my $old = $Config{$share}{$key};	624	my $old = $Config{$share}{$key};
627	if (defined $val) {	625	if (defined $val) {
628	if (defined $old && ref ($old) eq "ARRAY" && ref ($val) eq "ARRAY") {	626	if (defined $old && ref ($old) eq "ARRAY" && ref ($val) eq "ARRAY") {
Lines 652-659 Link Here
652	y2error("undefned key");	650	y2error("undefned key");
653	return undef;	651	return undef;
654	}	652	}
655	$key = lc($key);	653	$key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
656	$key = $Synonyms{$key} if exists $Synonyms{$key};
657		654
658	my $old = $Config{$share}{$key};	655	my $old = $Config{$share}{$key};
659	if (ref ($old) ne "ARRAY") {	656	if (ref ($old) ne "ARRAY") {
Lines 680-687 Link Here
680	return undef;	677	return undef;
681	}	678	}
682	my $modified = 0;	679	my $modified = 0;
683	$key = lc($key);	680	$key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
684	$key = $Synonyms{$key} if exists $Synonyms{$key};
685	if (exists $InvertedSynonyms{$key}) {	681	if (exists $InvertedSynonyms{$key}) {
686	$key = $InvertedSynonyms{$key};	682	$key = $InvertedSynonyms{$key};
687	my $old = toboolean($Config{$share}{$key});	683	my $old = toboolean($Config{$share}{$key});
Lines 1039-1046 Link Here
1039	y2error("undefned key");	1035	y2error("undefned key");
1040	return undef;	1036	return undef;
1041	}	1037	}
1042	$key = lc($key);	1038	$key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
1043	$key = $Synonyms{$key} if exists $Synonyms{$key};
1044	if (defined $WinbindConfig{$share} && defined $WinbindConfig{$share}{$key})	1039	if (defined $WinbindConfig{$share} && defined $WinbindConfig{$share}{$key})
1045	{	1040	{
1046	if (ref $WinbindConfig{$share}{$key} eq "ARRAY") {	1041	if (ref $WinbindConfig{$share}{$key} eq "ARRAY") {
Lines 1063-1070 Link Here
1063	y2error("undefned key");	1058	y2error("undefned key");
1064	return undef;	1059	return undef;
1065	}	1060	}
1066	$key = lc($key);	1061	$key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
1067	$key = $Synonyms{$key} if exists $Synonyms{$key};
1068		1062
1069	my $old = $WinbindConfig{$share}{$key};	1063	my $old = $WinbindConfig{$share}{$key};
1070	if (ref ($old) ne "ARRAY") {	1064	if (ref ($old) ne "ARRAY") {
Lines 1090-1097 Link Here
1090	return undef;	1084	return undef;
1091	}	1085	}
1092	my $modified = 0;	1086	my $modified = 0;
1093	$key = lc($key);	1087	$key = $Synonyms{lc ($key)} if exists $Synonyms{lc($key)};
1094	$key = $Synonyms{$key} if exists $Synonyms{$key};
1095	my $old = $WinbindConfig{$share}{$key};	1088	my $old = $WinbindConfig{$share}{$key};
1096	if (defined $val) {	1089	if (defined $val) {
1097	$modified = 1 unless defined $old and $old eq $val;	1090	$modified = 1 unless defined $old and $old eq $val;