Merge pull request #55 from yast/review_140731_checking_system_uid

[Review] Request from 'schubi2' @ 'yast/yast-users/review_140731_checking_system_uid'
yast · Jul 31, 2014 · b83a66a · b83a66a
2 parents 4805b2d + 755b7c9
commit b83a66a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 31 17:31:29 CEST 2014 - schubi@suse.de
+
+- Checking max UID for system users correctly while importing from
+  autoinst.xml. (bnc#888154)
+- 3.1.29
+
 -------------------------------------------------------------------
 Tue Jul 22 09:26:17 CEST 2014 - jsuchome@suse.cz
 

diff --git a/package/yast2-users.spec b/package/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        3.1.28
+Version:        3.1.29
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/Users.pm b/src/modules/Users.pm
@@ -5843,7 +5843,7 @@ sub ImportUser {
 
     my $type	= "local";
     if ($uid != -1 &&
-	($uid < UsersCache->GetMaxUID ("system") || $username eq "nobody")) {
+	($uid <= UsersCache->GetMaxUID ("system") || $username eq "nobody")) {
         $type = "system";
     }