Mailinglist Archive: yast-commit (525 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Wed Mar 10 15:19:36 2010
New Revision: 61229

URL: http://svn.opensuse.org/viewcvs/yast?rev=61229&view=rev
Log:
- YaPI: allow to specify default group by name (bnc#582254)
- 2.17.37


Modified:
    branches/SuSE-Code-11-SP1-Branch/users/VERSION
    branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes
    branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm

Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users/VERSION?rev=61229&r1=61228&r2=61229&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/users/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/users/VERSION Wed Mar 10 15:19:36 2010
@@ -1 +1 @@
-2.17.36
+2.17.37

Modified: branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes?rev=61229&r1=61228&r2=61229&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes Wed Mar 
10 15:19:36 2010
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Mar 10 15:11:05 CET 2010 - jsuchome@xxxxxxx
+
+- YaPI: allow to specify default group by name (bnc#582254)
+- 2.17.37
+
+-------------------------------------------------------------------
 Wed Mar 10 12:52:59 CET 2010 - jsuchome@xxxxxxx
 
 - check for autologin status also during firstboot (bnc#576899)

Modified: branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm?rev=61229&r1=61228&r2=61229&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm (original)
+++ branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm Wed Mar 10 
15:19:36 2010
@@ -103,13 +103,12 @@
 use strict;
 use YaST::YCP qw(:LOGGING);
 use YaPI;
+use Data::Dumper;
 
 textdomain ("users");
 
 
 # ------------------- imported modules
-YaST::YCP::Import ("Mode");
-
 YaST::YCP::Import ("Ldap");
 YaST::YCP::Import ("Users");
 YaST::YCP::Import ("UsersLDAP");
@@ -362,6 +361,7 @@
     "homeDirectory"    Users's home directory
     "loginShell"       User's login shell
     "gidNumber"                GID of user's default group
+    "groupname"                name of user's default group; YaST itself will 
look for GID
     "grouplist"        Hash (of type { <group_name> => 1 }) with groups
                        this user should be member of.
     "shadowinactive"   Days after password expires that account is disabled
@@ -443,7 +443,6 @@
     }
 
     Users->SetGUI (0);
-    Mode->SetUI ("commandline");
 
     $ret = Users->Read ();
     if ($ret ne "") { return $ret; }
@@ -477,6 +476,13 @@
     $user->{"type"}    = $type;
 
     Users->ResetCurrentUser ();
+
+    # if groupname was specified and not gidNumber, find the GID
+    if (($user->{"groupname"} || "") && ! defined $user->{"gidNumber"}) {
+
+       my $group = Users->GetGroupByName ($user->{"groupname"} || "", "");
+       $user->{"gidNumber"} = $group->{"gidNumber"} if (defined 
$group->{"gidNumber"});
+    }
     
     $ret = Users->AddUser ($user);
     if ($ret ne "") { return $ret; }
@@ -652,6 +658,12 @@
        $data->{"dn"}   = $user->{"dn"};
     }
 
+    # if groupname was specified and not gidNumber, find the GID
+    if (($data->{"groupname"} || "") && ! defined $data->{"gidNumber"}) {
+       my $group = Users->GetGroupByName ($data->{"groupname"} || "", "");
+       $data->{"gidNumber"} = $group->{"gidNumber"} if (defined 
$group->{"gidNumber"});
+    }
+
     $error = Users->EditUser ($data);
     if ($error eq "") {
        $error = Users->CheckUser ({});
@@ -1151,9 +1163,7 @@
     my $ret    = {};
     my $error  = "";
 
-    # FIXME HACK to prevent setting mode to testsuite (bnc#243624)
-    Mode->SetUI ("commandline");
-    
+   
     Users->SetGUI (0);
 
     my $type   = $config->{"type"} || "local";
@@ -1272,9 +1282,6 @@
     my $config = $_[0];
     my $ret    = {};
 
-    # FIXME HACK to prevent setting mode to testsuite (bnc#243624)
-    Mode->SetUI ("commandline");
-
     Users->SetGUI (0);
 
     my $type   = $config->{"type"} || "local";

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx