Merge lp:~sergiusens/ubuntu/wily/adduser/extrausers into lp:ubuntu/wily/adduser

[Sergio Schvezov]

This change depends on http://paste.ubuntu.com/11780424/

[lp:~sergiusens/ubuntu/wily/adduser/extrausers]

33. By Sergio Schvezov on 2015-06-26

more chfn

[Michael Vogt (mvo)]

adduser (3.113+nmu3ubuntu4) wily; urgency=medium

  * extrausers support for adduser (LP: #1323732)

 -- Sergio Schvezov <email address hidden> Fri, 26 Jun 2015 17:34:29 -0300

Unmerged revisions

33. By Sergio Schvezov on 2015-06-26

more chfn

32. By Sergio Schvezov on 2015-06-26

extrausers support for adduser (LP: #1323732)

=== modified file 'AdduserCommon.pm'
--- AdduserCommon.pm	2010-01-27 09:47:08 +0000
+++ AdduserCommon.pm	2015-06-26 21:27:23 +0000
@@ -213,6 +213,7 @@
   $configref->{"skel_ignore_regex"} = "dpkg-(old|new|dist)\$";
   $configref->{"extra_groups"} = "dialout cdrom floppy audio video plugdev users";
   $configref->{"add_extra_groups"} = 0;
+  $configref->{"use_extrausers"} = 0;
 
   foreach( @$conflistref ) {
       read_config($_,$configref);

=== modified file 'adduser'
--- adduser	2011-10-19 21:52:30 +0000
+++ adduser	2015-06-26 21:27:23 +0000
@@ -103,6 +103,7 @@
 our $special_home = undef;
 our $special_shell = undef;
 our $add_extra_groups = 0;
+our $use_extrausers = 0;
 our $encrypt_home = undef;
 
 # Global variables we need later
@@ -143,6 +144,7 @@
 	    "no-create-home" => \$no_create_home,
 	    "encrypt-home" => \$encrypt_home,
             "add_extra_groups" => \$add_extra_groups,
+        "extrausers" => \$use_extrausers,
 	    "debug" => sub { $verbose = 2 } ) ) {
     &usage();
     exit RET_INVALID_CALL;
@@ -307,7 +309,11 @@
     printf (gtx("Adding group `%s' (GID %d) ...\n"),$new_name,$new_gid) if $verbose;
     &invalidate_nscd("group");
     my $groupadd = &which('groupadd');
-    &systemcall($groupadd, '-g', $new_gid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($groupadd, '--extrausers', '-g', $new_gid, $new_name);
+    } else {
+        &systemcall($groupadd, '-g', $new_gid, $new_name);
+    }
     &invalidate_nscd("group");
     print (gtx("Done.\n")) if $verbose;
     exit RET_OK;
@@ -336,7 +342,11 @@
     printf (gtx("Adding group `%s' (GID %d) ...\n"),$new_name,$new_gid) if $verbose;
     &invalidate_nscd("group");
     my $groupadd = &which('groupadd');
-    &systemcall($groupadd, '-g', $new_gid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($groupadd, '--extrausers', '-g', $new_gid, $new_name);
+    } else {
+        &systemcall($groupadd, '-g', $new_gid, $new_name);
+    }
     &invalidate_nscd("group");
     print (gtx("Done.\n")) if $verbose;
     exit RET_OK;
@@ -431,7 +441,11 @@
 	printf (gtx("Adding new group `%s' (GID %d) ...\n"),$new_name,$new_gid) if $verbose;
 	$undogroup = $new_name;
        my $groupadd = &which('groupadd');
-	&systemcall($groupadd, '-g', $new_gid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($groupadd, '--extrausers', '-g', $new_gid, $new_name);
+    } else {
+        &systemcall($groupadd, '-g', $new_gid, $new_name);
+    }
 	&invalidate_nscd("group");
     }
 
@@ -441,8 +455,13 @@
     $shell = $special_shell || '/bin/false';
     $undouser = $new_name;
     my $useradd = &which('useradd');
-    &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
-		$shell, '-u', $new_uid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($useradd, '--extrausers', '-d', $home_dir, '-g', $ingroup_name, '-s',
+        $shell, '-u', $new_uid, $new_name);
+    } else {
+        &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
+        $shell, '-u', $new_uid, $new_name);
+    }
     if(!$disabled_login) {
         my $usermod = &which('usermod');
         &systemcall($usermod, '-p', '*', $new_name);
@@ -521,7 +540,11 @@
 	printf (gtx("Adding new group `%s' (%d) ...\n"),$new_name,$new_gid) if $verbose;
 	$undogroup = $new_name;
         my $groupadd = &which('groupadd');
-	&systemcall($groupadd, '-g', $new_gid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($groupadd, '--extrausers', '-g', $new_gid, $new_name);
+    } else {
+        &systemcall($groupadd, '-g', $new_gid, $new_name);
+    }
 	&invalidate_nscd();
     }
 
@@ -531,8 +554,13 @@
 	$shell = $special_shell || $config{"dshell"};
     $undouser = $new_name;
     my $useradd = &which('useradd');
-    &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
-		$shell, '-u', $new_uid, $new_name);
+    if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+        &systemcall($useradd, '--extrausers', '-d', $home_dir, '-g', $ingroup_name, '-s',
+        $shell, '-u', $new_uid, $new_name);
+    } else {
+        &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
+        $shell, '-u', $new_uid, $new_name);
+    }
     &invalidate_nscd();
 
     create_homedir (1); # copy skeleton data
@@ -581,7 +609,11 @@
 	my $noexpr = langinfo(NOEXPR());
 	for (;;) {
            my $chfn = &which('chfn');
-	    &systemcall($chfn, $new_name);
+        if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+    	    &systemcall($chfn, '--extrausers', $new_name);
+        } else {
+    	    &systemcall($chfn, $new_name);
+        }
 	    # Translators: [y/N] has to be replaced by values defined in your
 	    # locale.  You can see by running "locale yesexpr" which regular
 	    # expression will be checked to find positive answer.
@@ -948,17 +980,31 @@
 	  my($gecos_name,$gecos_room,$gecos_work,$gecos_home,$gecos_other)
 	    = split(/,/,$gecos);
 
-	  &systemcall($chfn, '-f', $gecos_name, '-r', $gecos_room, $new_name);
-	  &systemcall($chfn,'-w',$gecos_work,$new_name)
-	    if(defined($gecos_work));
-	  &systemcall($chfn,'-h',$gecos_home,$new_name)
-	    if(defined($gecos_home));
-	  &systemcall($chfn,'-o',$gecos_other,$new_name)
-	    if(defined($gecos_other));
+        if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+            &systemcall($chfn, '--extrausers', '-f', $gecos_name, '-r', $gecos_room, $new_name);
+            &systemcall($chfn,'--extrausers','-w',$gecos_work,$new_name)
+                if(defined($gecos_work));
+            &systemcall($chfn,'--extrausers','-h',$gecos_home,$new_name)
+                if(defined($gecos_home));
+            &systemcall($chfn,'--extrausers','-o',$gecos_other,$new_name)
+                if(defined($gecos_other));
+        } else {
+            &systemcall($chfn, '-f', $gecos_name, '-r', $gecos_room, $new_name);
+            &systemcall($chfn,'-w',$gecos_work,$new_name)
+                if(defined($gecos_work));
+            &systemcall($chfn,'-h',$gecos_home,$new_name)
+                if(defined($gecos_home));
+            &systemcall($chfn,'-o',$gecos_other,$new_name)
+                if(defined($gecos_other));
+        } 
       }
     else
       {
-	  &systemcall($chfn, '-f', $gecos, $new_name);
+        if ( ($use_extrausers) || ($config{"use_extrausers"}) ) {
+            &systemcall($chfn, '--extrausers', '-f', $gecos, $new_name);
+        } else {
+            &systemcall($chfn, '-f', $gecos, $new_name);
+        }
       }
 }
 
@@ -1046,6 +1092,7 @@
   --quiet | -q      don't give process information to stdout
   --force-badname   allow usernames which do not match the
                     NAME_REGEX[_SYSTEM] configuration variable
+  --extrausers      uses extra users as the database
   --help | -h       usage message
   --version | -v    version number and copyright
   --conf | -c FILE  use FILE as configuration file\n\n");

=== modified file 'adduser.conf'
--- adduser.conf	2010-01-27 09:47:08 +0000
+++ adduser.conf	2015-06-26 21:27:23 +0000
@@ -83,3 +83,6 @@
 
 # check user and group names also against this regular expression.
 #NAME_REGEX="^[a-z][-a-z0-9_]*\$"
+
+# use extrausers by default
+#USE_EXTRAUSERS=1

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-30 14:51:16 +0000
+++ debian/changelog	2015-06-26 21:27:23 +0000
@@ -1,3 +1,9 @@
+adduser (3.113+nmu3ubuntu4) UNRELEASED; urgency=medium
+
+  * extrausers support for adduser (LP: #1323732)
+
+ -- Sergio Schvezov <[e-mail]>  Fri, 26 Jun 2015 17:34:29 -0300
+
 adduser (3.113+nmu3ubuntu3) trusty; urgency=low
 
   * Add autopkgtest. (LP: #1246331)

=== modified file 'debian/control'
--- debian/control	2013-10-30 14:51:16 +0000
+++ debian/control	2015-06-26 21:27:23 +0000
@@ -15,7 +15,7 @@
 Package: adduser
 Architecture: all
 Multi-Arch: foreign
-Depends: perl-base (>=5.6.0), passwd (>= 1:4.0.12), debconf | debconf-2.0
+Depends: perl-base (>=5.6.0), passwd (>= 1:4.1.5.1-1.1ubuntu6), debconf | debconf-2.0
 Suggests: liblocale-gettext-perl, perl-modules, ecryptfs-utils (>= 67-1)
 Replaces: manpages-pl (<= 20051117-1), manpages-it (<< 0.3.4-2)
 Description: add and remove users and groups