[yast-commit] r49671 - in /trunk/samba-server: ./ package/ src/ users-plugin/

5 Aug 2008

Author: locilka
Date: Tue Aug  5 10:39:17 2008
New Revision: 49671

URL: http://svn.opensuse.org/viewcvs/yast?rev=49671&view=rev
Log:
- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)
  (FATE #303596).
- 2.17.0


Modified:
    trunk/samba-server/VERSION
    trunk/samba-server/package/yast2-samba-server.changes
    trunk/samba-server/src/SambaBackendLDAP.pm
    trunk/samba-server/users-plugin/UsersPluginSamba.pm
    trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm
    trunk/samba-server/users-plugin/users_plugin_samba.ycp
    trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp

Modified: trunk/samba-server/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=49671&r1=49670&r2=49671&view=diff
==============================================================================

--- trunk/samba-server/VERSION (original)
+++ trunk/samba-server/VERSION Tue Aug  5 10:39:17 2008
@@ -1 +1 @@
-2.16.3
+2.17.0

Modified: trunk/samba-server/package/yast2-samba-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba-server.changes?rev=49671&r1=49670&r2=49671&view=diff
==============================================================================
--- trunk/samba-server/package/yast2-samba-server.changes (original)
+++ trunk/samba-server/package/yast2-samba-server.changes Tue Aug  5 10:39:17 2008
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Aug  5 10:36:39 CEST 2008 - locilka@suse.cz
+
+- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)
+  (FATE #303596).
+- 2.17.0
+
+-------------------------------------------------------------------
 Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz
 
 - added categories Settings and System into desktop file

Modified: trunk/samba-server/src/SambaBackendLDAP.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/SambaBackendLDAP.pm?rev=49671&r1=49670&r2=49671&view=diff
==============================================================================
--- trunk/samba-server/src/SambaBackendLDAP.pm (original)
+++ trunk/samba-server/src/SambaBackendLDAP.pm Tue Aug  5 10:39:17 2008
@@ -280,14 +280,14 @@
 		    
     my $templates = Ldap->GetTemplates();
     while(my ($dn, $content) = each %$templates) {
-	my %objectclass = map {lc $_, 1} @{$content->{objectclass}};
-	my %suseplugin = map {$_, 1} @{$content->{suseplugin}};
-	if ($objectclass{suseusertemplate} and not $suseplugin{UsersPluginSamba}) {
-	    push @{$content->{suseplugin}}, "UsersPluginSamba";
+	my %objectClass = map {$_, 1} @{$content->{objectClass}};
+	my %susePlugin = map {$_, 1} @{$content->{susePlugin}};
+	if ($objectClass{suseUserTemplate} and not $susePlugin{UsersPluginSamba}) {
+	    push @{$content->{susePlugin}}, "UsersPluginSamba";
 	    $modified = $content->{modified} = "edited";
 	}
-	if ($objectclass{susegrouptemplate} and not $suseplugin{UsersPluginSambaGroup}) {
-	    push @{$content->{suseplugin}}, "UsersPluginSambaGroup";
+	if ($objectClass{suseGroupTemplate} and not $susePlugin{UsersPluginSambaGroup}) {
+	    push @{$content->{susePlugin}}, "UsersPluginSambaGroup";
 	    $modified = $content->{modified} = "edited";
 	}
     }
@@ -326,8 +326,8 @@
     y2milestone("Creating dn: $dn");
     my $map;
     given($attr) {
-	when ("dc") {$map = {objectclass => ["top", "dcobject"], dc => $value}}
-	when ("ou") {$map = {objectclass => ["top", "organizationalunit"], ou => $value}}
+	when ("dc") {$map = {objectClass => ["top", "dcobject"], dc => $value}}
+	when ("ou") {$map = {objectClass => ["top", "organizationalunit"], ou => $value}}
 	# translators: error message, followed by class giving error
 	default {return __("Unknown Class:")." $dn\n".__("Only dcObject (dc) and organizationalUnit (ou) classes are supported.")}
     };
@@ -476,9 +476,9 @@
 	Ldap->ReadConfigModules();
 	my $conf = Ldap->GetConfigModules();
 	while(my ($dn, $c) = each %$conf) {
-    	    my %classes = map {lc $_, 1} @{$c->{objectclass}};
-	    @user = split ",", $c->{susedefaultbase}[0] if $classes{"suseuserconfiguration"};
-	    @group = split ",", $c->{susedefaultbase}[0] if $classes{"susegroupconfiguration"};
+    	    my %classes = map {$_, 1} @{$c->{objectClass}};
+	    @user = split ",", $c->{suseDefaultBase}[0] if $classes{"suseUserConfiguration"};
+	    @group = split ",", $c->{suseDefaultBase}[0] if $classes{"suseGroupConfiguration"};
 	}
 	y2milestone("SuseDefaultBase: user=".join(",",@user)." group=",join(",",@group));
     }

Modified: trunk/samba-server/users-plugin/UsersPluginSamba.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/UsersPluginSamba.pm?rev=49671&r1=49670&r2=49671&view=diff
==============================================================================
--- trunk/samba-server/users-plugin/UsersPluginSamba.pm (original)
+++ trunk/samba-server/users-plugin/UsersPluginSamba.pm Tue Aug  5 10:39:17 2008
@@ -137,7 +137,7 @@
     my $config    = shift;
     my $data    = shift;
 
-    if ( grep /^sambasamaccount$/i, @{$data->{'objectclass'}} ) {
+    if ( grep /^sambasamaccount$/i, @{$data->{'objectClass'}} ) {
         y2milestone( "SambaPlugin: Plugin Present");
         return 1;
     } else {
@@ -204,8 +204,8 @@
     }
     my $ret = $self->update_object_classes( $config, $data );
     if( $ret ) {
-        y2internal("Could not update objectclass attribute");
-        $error	= __("Could not update objectclass attribute.");
+        y2internal("Could not update objectClass attribute");
+        $error	= __("Could not update objectClass attribute.");
         return undef;
     }
     return $data;
@@ -293,7 +293,7 @@
     if( ! $data->{'sambainternal'}->{'initialized'} ) {
         $self->init_internal_keys( $config,  $data );
         $data->{'sambainternal'}->{'initialized'} = 1;
-    } elsif ( (! $data->{'sambalmpassword'}) && 
+    } elsif ( (! $data->{'sambaLMPassword'}) && 
               ( (! $data->{'text_userpassword'} ) || ($data->{'text_userpassword'} eq "" )) ){
             $error	= __("Change the password to create the Samba account");
             return undef;
@@ -306,7 +306,7 @@
     }
 
     $self->update_attributes ($config, $data);
-    if ( (! $data->{'sambalmpassword'})  ) {
+    if ( (! $data->{'sambaLMPassword'})  ) {
         y2debug ("no samba password hashes present yet");
     }
 
@@ -329,10 +329,10 @@
     my $oc = "sambaSamAccount";
 
     # define the object class for new user/groupa
-    if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY")
+    if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY")
     {
-        if ( ! grep /^$oc$/i, @{$data->{'objectclass'}} ) {
-	    push @{$data->{'objectclass'}}, $oc;
+        if ( ! grep /^$oc$/i, @{$data->{'objectClass'}} ) {
+	    push @{$data->{'objectClass'}}, $oc;
             y2milestone("added ObjectClass $oc");
         }
     }
@@ -342,10 +342,10 @@
 sub init_internal_keys {
     my ($self, $config, $data) = @_;
     
-    if ( $data->{'sambaacctflags'} ) {
+    if ( $data->{'sambaAcctFlags'} ) {
         if ( ! defined( $data->{'sambadisabled'} ) ) {
             y2internal("    UsersPluginSamba::init_internal_keys sambadisabled undefined ");
-            if ( $data->{'sambaacctflags'} =~ /^\[.*D.*\]/ ) {
+            if ( $data->{'sambaAcctFlags'} =~ /^\[.*D.*\]/ ) {
                 $data->{'sambadisabled'} = "1";
             } else {
                 $data->{'sambadisabled'} = "0";
@@ -353,7 +353,7 @@
         }
         if ( ! defined( $data->{'sambanoexpire'} ) ) {
             y2internal("    UsersPluginSamba::init_internal_keys sambanoexpire undefined ");
-            if ( $data->{'sambaacctflags'} =~ /^\[.*X.*\]/ ) {
+            if ( $data->{'sambaAcctFlags'} =~ /^\[.*X.*\]/ ) {
                 $data->{'sambanoexpire'} = "1";
             } else {
                 $data->{'sambanoexpire'} = "0";
@@ -367,18 +367,18 @@
     my ( $self, $config, $data ) = @_;
 
     my $SID     = $data->{'sambainternal'}->{'sambalocalsid'};
-    my $uidNumber = $data->{'uidnumber'};
+    my $uidNumber = $data->{'uidNumber'};
     if ( $uidNumber ) {
-        if ( (! $data->{'sambasid'}) || ($data->{'sambasid'} eq "") ) {
-            $data->{'sambasid'} = $SID."-". ( 2 * $uidNumber +
+        if ( (! $data->{'sambaSID'}) || ($data->{'sambaSID'} eq "") ) {
+            $data->{'sambaSID'} = $SID."-". ( 2 * $uidNumber +
                                 $data->{'sambainternal'}->{'ridbase'} );
         }
     }
-    my $gidNumber = $data->{'gidnumber'};
+    my $gidNumber = $data->{'gidNumber'};
     if ( $gidNumber ) {
-        if ( (! $data->{'sambaprimarygroupsid'}) || 
-                ($data->{'sambaprimarygroupsid'} eq "") ) {
-            $data->{'sambaprimarygroupsid'} = $SID."-". (2 * $gidNumber + 
+        if ( (! $data->{'sambaPrimaryGroupSID'}) || 
+                ($data->{'sambaPrimaryGroupSID'} eq "") ) {
+            $data->{'sambaPrimaryGroupSID'} = $SID."-". (2 * $gidNumber + 
                                 $data->{'sambainternal'}->{'ridbase'} + 1 );
         }
     }
@@ -398,7 +398,7 @@
 sub update_samba_acctflags {
     my ($self, $config, $data) = @_;
 
-    my $acctflags = $data->{'sambaacctflags'} || "[U         ]";
+    my $acctflags = $data->{'sambaAcctFlags'} || "[U         ]";
 
     $acctflags =~ s/^\[(\w+)\s*\]$/$1/g;
     
@@ -425,7 +425,7 @@
     for( my $i=0; $i < ( 11 - $len ); $i++ ) {
         $acctflags .= " ";
     }
-    $data->{'sambaacctflags'} = "[". $acctflags ."]";
+    $data->{'sambaAcctFlags'} = "[". $acctflags ."]";
     return undef;
 }
 
@@ -435,19 +435,19 @@
     if ( $data->{'sambainternal'}->{'sambacleartextpw'} ) {
         my $update_timestamp = 0;
         my ($lmHash, $ntHash) = ntlmgen($data->{'sambainternal'}->{'sambacleartextpw'});
-        if ( (!$data->{'sambalmpassword'}) || ($lmHash ne $data->{'sambalmpassword'}) ) {
-            $data->{'sambalmpassword'} = $lmHash;
+        if ( (!$data->{'sambaLMPassword'}) || ($lmHash ne $data->{'sambaLMPassword'}) ) {
+            $data->{'sambaLMPassword'} = $lmHash;
             $update_timestamp = 1;
         }
-        if ( (! $data->{'sambantpassword'}) || ( $ntHash ne $data->{'sambantpassword'} ) ) {
-            $data->{'sambantpassword'} = $ntHash;
+        if ( (! $data->{'sambaNTPassword'}) || ( $ntHash ne $data->{'sambaNTPassword'} ) ) {
+            $data->{'sambaNTPassword'} = $ntHash;
             $update_timestamp = 1;
         }
         if ( $update_timestamp ) {
-            $data->{'sambapwdlastset'} = time ();
-            $data->{'sambapwdcanchange'} = $data->{'sambapwdlastset'};
+            $data->{'sambaPwdLastSet'} = time ();
+            $data->{'sambaPwdCanChange'} = $data->{'sambaPwdLastSet'};
         }
-        $data->{'sambapwdmustchange'} = ( 1 << 31 ) - 1;
+        $data->{'sambaPwdMustChange'} = ( 1 << 31 ) - 1;
     }
     return undef;
 }
@@ -460,7 +460,7 @@
         my $res = SCR->Read(".ldap.search", { base_dn => $base_dn,
                                               scope => YaST::YCP::Integer(2),
                                               filter => "(objectClass=sambaDomain)",
-                                              attrs => ['sambasid', 'sambaalgorithmicridbase']
+                                              attrs => ['sambaSID', 'sambaAlgorithmicRidBase']
                                             } 
                             ); 
         if ( ! $res ){
@@ -471,9 +471,9 @@
             return "error reading samba sid";
         } else {
             #y2milestone( Data::Dumper->Dump( [$res] ));
-            if ( $res->[0]->{'sambasid'}->[0] ) {
-                $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambasid'}->[0];
-                $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaalgorithmicridbase'}->[0];
+            if ( $res->[0]->{'sambaSID'}->[0] ) {
+                $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambaSID'}->[0];
+                $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaAlgorithmicRidBase'}->[0];
                 return undef;
             } else {
                 return "error reading samba sid";
@@ -486,7 +486,7 @@
     my ( $self, $config, $data ) = @_;
   
     my @updated_oc;
-    foreach my $oc ( @{$data->{'objectclass'}} ) {
+    foreach my $oc ( @{$data->{'objectClass'}} ) {
         if ( lc($oc) ne "sambasamaccount" ) {
             push @updated_oc, $oc;
         }
@@ -495,7 +495,7 @@
     delete( $data->{'sambadisabled'});
     delete( $data->{'sambainternal'});
 
-    $data->{'objectclass'} = \@updated_oc;
+    $data->{'objectClass'} = \@updated_oc;
 }
 1;
 # EOF

Modified: trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm?rev=49671&r1=49670&r2=49671&view=diff
==============================================================================
--- trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm (original)
+++ trunk/samba-server/users-plugin/UsersPluginSambaGroups.pm Tue Aug  5 10:39:17 2008
@@ -132,7 +132,7 @@
     my $config    = shift;
     my $data    = shift;
 
-    if ( grep /^sambagroupmapping$/i, @{$data->{'objectclass'}} ) {
+    if ( grep /^sambagroupmapping$/i, @{$data->{'objectClass'}} ) {
         y2milestone( "SambaPlugin: Plugin Present");
         return 1;
     } else {
@@ -285,10 +285,10 @@
     my $oc = "sambaGroupMapping";
 
     # define the object class for new user/groupa
-    if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY")
+    if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY")
     {
-        if ( ! grep /^$oc$/i, @{$data->{'objectclass'}} ) {
-	    push @{$data->{'objectclass'}}, $oc;
+        if ( ! grep /^$oc$/i, @{$data->{'objectClass'}} ) {
+	    push @{$data->{'objectClass'}}, $oc;
             #y2milestone("added ObjectClass $oc");
         }
     }
@@ -309,22 +309,22 @@
 	if (defined $data->{'sambainternal'}->{'sambalocalsid'});
 
     my $gidNumber = 0;
-    $gidNumber = $data->{'gidnumber'}
-	if (defined $data->{'gidnumber'});
+    $gidNumber = $data->{'gidNumber'}
+	if (defined $data->{'gidNumber'});
 
     my $ridbase = 0;
     $ridbase = $data->{'sambainternal'}->{'ridbase'}
 	if (defined $data->{'sambainternal'}->{'ridbase'});
 
     if ( $gidNumber ) {
-        if ( (! $data->{'sambasid'}) || ($data->{'sambasid'} eq "") ) {
-            $data->{'sambasid'} = $SID."-". (2 * $gidNumber + $ridbase + 1);
+        if ( (! $data->{'sambaSID'}) || ($data->{'sambaSID'} eq "") ) {
+            $data->{'sambaSID'} = $SID."-". (2 * $gidNumber + $ridbase + 1);
         }
     }
-    if( ! $data->{'displayname'} ) {
-        $data->{'displayname'} = (defined $data->{'cn'} ? $data->{'cn'}:"");
+    if( ! $data->{'displayName'} ) {
+        $data->{'displayName'} = (defined $data->{'cn'} ? $data->{'cn'}:"");
     }
-    $data->{'sambagrouptype'} = "2";
+    $data->{'sambaGroupType'} = "2";
 
     return undef;
 }
@@ -337,7 +337,7 @@
         my $res = SCR->Read(".ldap.search", { base_dn => $base_dn,
                                               scope => YaST::YCP::Integer(2),
                                               filter => "(objectClass=sambaDomain)",
-                                              attrs => ['sambasid', 'sambaalgorithmicridbase']
+                                              attrs => ['sambaSID', 'sambaAlgorithmicRidBase']
                                             } 
                             ); 
         if ( ! $res ){
@@ -347,9 +347,9 @@
             y2internal("$ldaperr->{'msg'}");
         } else {
             #y2milestone( Data::Dumper->Dump( [$res] ));
-            if ( $res->[0]->{'sambasid'}->[0] ) {
-                $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambasid'}->[0];
-                $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaalgorithmicridbase'}->[0];
+            if ( $res->[0]->{'sambaSID'}->[0] ) {
+                $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambaSID'}->[0];
+                $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaAlgorithmicRidBase'}->[0];
                 return undef;
             } else {
                 return "error reading samba sid";
@@ -362,28 +362,28 @@
     my ( $self, $config, $data ) = @_;
   
     my @updated_oc;
-    foreach my $oc ( @{$data->{'objectclass'}} ) {
+    foreach my $oc ( @{$data->{'objectClass'}} ) {
         if ( lc($oc) ne "sambagroupmapping" ) {
             push @updated_oc, $oc;
         }
     }
 #    delete( $data->{'sambainternal'});
-#    delete( $data->{'sambapwdmustchange'});
-#    delete( $data->{'sambapwdlastset'});
-#    delete( $data->{'sambapwdcanchange'});
+#    delete( $data->{'sambaPwdMustChange'});
+#    delete( $data->{'sambaPwdLastSet'});
+#    delete( $data->{'sambaPwdCanChange'});
 #    delete( $data->{'sambantpassword'});
 #    delete( $data->{'sambalmpassword'});
 #    delete( $data->{'sambaacctflags'});
-#    delete( $data->{'sambahomedrive'});
-#    delete( $data->{'sambahomepath'});
-#    delete( $data->{'sambaprofilepath'});
-#    delete( $data->{'sambalogonscript'});
-#    delete( $data->{'sambasid'});
-#    delete( $data->{'sambaprimarygroupssid'});
+#    delete( $data->{'sambaHomeDrive'});
+#    delete( $data->{'sambaHomePath'});
+#    delete( $data->{'sambaProfilePath'});
+#    delete( $data->{'sambaLogonScript'});
+#    delete( $data->{'sambaSID'});
+#    delete( $data->{'sambaPrimaryGroupSID'});
 #    delete( $data->{'sambanoexprire'});
 #    delete( $data->{'sambadisabled'});
 
-    $data->{'objectclass'} = \@updated_oc;
+    $data->{'objectClass'} = \@updated_oc;
     return undef;
 }
 

Modified: trunk/samba-server/users-plugin/users_plugin_samba.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/users_plugin_samba.ycp?rev=49671&r1=49670&r2=49671&view=diff
==============================================================================
--- trunk/samba-server/users-plugin/users_plugin_samba.ycp (original)
+++ trunk/samba-server/users-plugin/users_plugin_samba.ycp Tue Aug  5 10:39:17 2008
@@ -74,33 +74,33 @@
             `VSpacing(0.5),
 	    `Frame ( _("Home Drive"),
 		     `VBox(
-			   `TextEntry(`id(`homeDrive), "", data["sambahomedrive"]:"" ),
+			   `TextEntry(`id(`homeDrive), "", data["sambaHomeDrive"]:"" ),
 			   `Left(`CheckBox( `id(`defhomeDrive ), `opt(`notify), _("Use Default Values"),
-				      size (data["sambahomedrive"]:"") <= 0
+				      size (data["sambaHomeDrive"]:"") <= 0
 					    ))
 			   )
 		     ),
 	    `Frame ( _("Home Path"),
 		     `VBox(
-			   `TextEntry(`id(`homePath), "", data["sambahomepath"]:"" ),
+			   `TextEntry(`id(`homePath), "", data["sambaHomePath"]:"" ),
 			   `Left(`CheckBox( `id(`defhomePath ), `opt(`notify), _("Use Default Values"),
-				      size (data["sambahomepath"]:"") <= 0
+				      size (data["sambaHomePath"]:"") <= 0
 					    ))
 			   )
 		     ),
 	    `Frame ( _("Profile Path"),
 		     `VBox(
-			   `TextEntry(`id(`profilePath), "", data["sambaprofilepath"]:"" ),
+			   `TextEntry(`id(`profilePath), "", data["sambaProfilePath"]:"" ),
 			   `Left(`CheckBox( `id(`defprofilePath ), `opt(`notify), _("Use Default Values"),
-					    size (data["sambaprofilepath"]:"") <= 0))
+					    size (data["sambaProfilePath"]:"") <= 0))
 			   )
 		     ),
 	    // translators: logon is the Windows synonym for login
 	    `Frame ( _("Logon Script"),
 		     `VBox(
-			   `TextEntry(`id(`logonScript), "", data["sambalogonscript"]:"" ),
+			   `TextEntry(`id(`logonScript), "", data["sambaLogonScript"]:"" ),
 			   `Left(`CheckBox( `id(`deflogonScript ), `opt(`notify), _("Use Default Values"),
-					    size (data["sambalogonscript"]:"") <= 0))
+					    size (data["sambaLogonScript"]:"") <= 0))
 			   )
 		     ),
             `VSpacing (1.5),
@@ -138,35 +138,35 @@
 		string err = UsersPluginSamba::Check ( config, data);
 		if ((boolean) UI::QueryWidget(`id(`defhomeDrive), `Value))
 		{
-		    data["sambahomedrive"] = "";
+		    data["sambaHomeDrive"] = "";
 		}
 		else
 		{
-		    data["sambahomedrive"] = UI::QueryWidget(`id(`homeDrive), `Value );
+		    data["sambaHomeDrive"] = UI::QueryWidget(`id(`homeDrive), `Value );
 		}
 		if ((boolean) UI::QueryWidget(`id(`defhomePath), `Value))
 		{
-		    data["sambahomepath"] = "";
+		    data["sambaHomePath"] = "";
 		}
 		else
 		{
-		    data["sambahomepath"] = UI::QueryWidget(`id(`homePath), `Value );		    
+		    data["sambaHomePath"] = UI::QueryWidget(`id(`homePath), `Value );		    
 		}
 		if ((boolean) UI::QueryWidget(`id(`defprofilePath), `Value))
 		{		
-		    data["sambaprofilepath"] = "";
+		    data["sambaProfilePath"] = "";
 		}
 		else
 		{		
-		    data["sambaprofilepath"] = UI::QueryWidget(`id(`profilePath), `Value );
+		    data["sambaProfilePath"] = UI::QueryWidget(`id(`profilePath), `Value );
 		}
 		if ((boolean) UI::QueryWidget(`id(`deflogonScript), `Value))
 		{		
-		    data["sambalogonscript"] = "";
+		    data["sambaLogonScript"] = "";
 		}
 		else
 		{
-		    data["sambalogonscript"] = UI::QueryWidget(`id(`logonScript), `Value );
+		    data["sambaLogonScript"] = UI::QueryWidget(`id(`logonScript), `Value );
 		}
                 data["sambanoexpire"] = ( UI::QueryWidget(`id(`noExpire), `Value ) == true ) ? "1" : "0";
                 data["sambadisabled"] = ( UI::QueryWidget(`id(`disable), `Value ) == true ) ? "1" : "0";

Modified: trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp?rev=49671&r1=49670&r2=49671&view=diff
==============================================================================
--- trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp (original)
+++ trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp Tue Aug  5 10:39:17 2008
@@ -77,7 +77,7 @@
 
         contents = `HBox(`HSpacing (1.5), `VBox(
             `VSpacing(0.5),
-            `TextEntry(`id(`smbName), _("Samba Group Name"), data["displayname"]:"" ),
+            `TextEntry(`id(`smbName), _("Samba Group Name"), data["displayName"]:"" ),
             `VSpacing (0.5)
             ),
             `HSpacing (1.5)
@@ -99,7 +99,7 @@
 	    if ( ret == `next )
 	    {
 		string err = UsersPluginSambaGroups::Check ( config, data);
-                data["displayname"] = UI::QueryWidget(`id(`smbName), `Value );
+                data["displayName"] = UI::QueryWidget(`id(`smbName), `Value );
 		if (err != "")
 		{
 		    Report::Error (err);

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r49671 - in /trunk/samba-server: ./ package/ src/ users-plugin/

locilka＠svn.opensuse.org