Remove ag_uid, inlining it in UsersCache.pm (bsc#1172139)

Eliminating this Perl process saves 11 MiB of memory at installation time.
yast · Aug 3, 2020 · ebe9099 · ebe9099
1 parent 0778d8d
commit ebe9099
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 90 deletions.
diff --git a/agent-nis/.gitignore b/agent-nis/.gitignore
diff --git a/agent-uid/.gitignore b/agent-uid/.gitignore
diff --git a/agents/.gitignore b/agents/.gitignore
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -79,13 +79,11 @@ ylib_DATA = \
   lib/users/widgets.rb
 
 scrconf_DATA = \
-  scrconf/uid.scr \
   scrconf/etc_default_useradd.scr \
   scrconf/nis.scr
 
 agent_SCRIPTS = \
-  servers_non_y2/ag_nis \
-  servers_non_y2/ag_uid
+  servers_non_y2/ag_nis
 
 schemafilesdir = $(schemadir)/autoyast/rnc
 schemafiles_DATA = \

diff --git a/src/modules/UsersCache.pm b/src/modules/UsersCache.pm
@@ -29,6 +29,7 @@ use strict;
 
 use YaST::YCP qw(:LOGGING);
 use YaPI;
+use User::pwent;
 
 textdomain ("users");
 
@@ -232,9 +233,15 @@ sub CustomizedGroupsView {
 
 ##------------------------------------
 sub UIDConflicts {
+    my $id = $_[0];
 
-    my $ret = SCR->Read (".uid.uid", $_[0]);
-    return !$ret;
+    my $pw = getpwuid($id);
+    if (defined $pw) {
+        my $name = $pw->name;
+        y2debug ("$id is UID of user $name");
+        return 1;
+    }
+    return 0;
 }
 
 ##------------------------------------
@@ -273,9 +280,15 @@ sub UIDExists {
 }
 
 sub UsernameConflicts {
+    my $username = $_[0];
 
-    my $ret = SCR->Read (".uid.username", $_[0]);
-    return !$ret;
+    my $pw = getpwnam($username);
+    if (defined $pw) {
+        my $uid = $pw->uid;
+        y2debug ("$username is used with uid $uid");
+        return 1;
+    }
+    return 0;
 }
 
 ##------------------------------------

diff --git a/src/scrconf/uid.scr b/src/scrconf/uid.scr
diff --git a/src/servers_non_y2/ag_uid b/src/servers_non_y2/ag_uid