[Pkg-shadow-devel] Ubuntu shadow 1:4.1.5.1-1.1ubuntu6
Ubuntu Merge-o-Matic
mom at ubuntu.com
Thu Jul 2 23:10:01 UTC 2015
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Thu, 25 Jun 2015 15:26:55 -0300
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.1.5.1-1.1ubuntu6
Distribution: wily
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Sergio Schvezov <sergio.schvezov at canonical.com>
Description:
login - system login tools
passwd - change and administer password and group data
uidmap - programs to help use subuids
Launchpad-Bugs-Fixed: 1323732
Changes:
shadow (1:4.1.5.1-1.1ubuntu6) wily; urgency=medium
.
* extrausers support for useradd and groupadd (LP: #1323732)
Checksums-Sha1:
7c3a1c088181e9b411fe93f96f088ae5ee6a05a8 2398 shadow_4.1.5.1-1.1ubuntu6.dsc
b7f915c91a45c2ee8596840f5e5ddb7dd03c7d94 115369 shadow_4.1.5.1-1.1ubuntu6.diff.gz
Checksums-Sha256:
3a48a55dcbb52230ef749e415bfb9f668c7bbf2a842d0d06a4c31fef3439ba07 2398 shadow_4.1.5.1-1.1ubuntu6.dsc
75396a6bcea1d302398207cc64efe09fddd13e7199eed13d66dd03c57826ac70 115369 shadow_4.1.5.1-1.1ubuntu6.diff.gz
Files:
0126fc159439c258b602a173fc2b4cc6 2398 admin required shadow_4.1.5.1-1.1ubuntu6.dsc
b5897f0aacd4551d7c7135f314cd15d9 115369 admin required shadow_4.1.5.1-1.1ubuntu6.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.5.1-1.1ubuntu5/debian/changelog 1:4.1.5.1-1.1ubuntu6/debian/changelog
--- 1:4.1.5.1-1.1ubuntu5/debian/changelog 2015-07-02 23:06:53.000000000 +0000
+++ 1:4.1.5.1-1.1ubuntu6/debian/changelog 2015-07-02 23:06:52.000000000 +0000
@@ -1,3 +1,9 @@
+shadow (1:4.1.5.1-1.1ubuntu6) wily; urgency=medium
+
+ * extrausers support for useradd and groupadd (LP: #1323732)
+
+ -- Sergio Schvezov <sergio.schvezov at canonical.com> Thu, 25 Jun 2015 15:26:55 -0300
+
shadow (1:4.1.5.1-1.1ubuntu5) wily; urgency=medium
* debian/rules: Re-enable audit support. (LP: #1414817)
diff -pruN 1:4.1.5.1-1.1ubuntu5/debian/patches/1011_extrausers_toggle.patch 1:4.1.5.1-1.1ubuntu6/debian/patches/1011_extrausers_toggle.patch
--- 1:4.1.5.1-1.1ubuntu5/debian/patches/1011_extrausers_toggle.patch 1970-01-01 00:00:00.000000000 +0000
+++ 1:4.1.5.1-1.1ubuntu6/debian/patches/1011_extrausers_toggle.patch 2015-07-02 23:06:52.000000000 +0000
@@ -0,0 +1,144 @@
+--- a/lib/defines.h
++++ b/lib/defines.h
+@@ -324,6 +324,22 @@
+ #define EXTRAUSERS_SHADOW_FILE "/var/lib/extrausers/shadow"
+ #endif
+
++#ifndef EXTRAUSERS_GROUP_FILE
++#define EXTRAUSERS_GROUP_FILE "/var/lib/extrausers/group"
++#endif
++
++#ifndef EXTRAUSERS_SHADOWGROUP_FILE
++#define EXTRAUSERS_SHADOWGROUP_FILE "/var/lib/extrausers/gshadow"
++#endif
++
++#ifndef EXTRAUSERS_SUBUID_FILE
++#define EXTRAUSERS_SUBUID_FILE "/var/lib/extrausers/subuid"
++#endif
++
++#ifndef EXTRAUSERS_SUBGID_FILE
++#define EXTRAUSERS_SUBGID_FILE "/var/lib/extrausers/subgid"
++#endif
++
+ #ifndef NULL
+ #define NULL ((void *) 0)
+ #endif
+--- a/src/groupadd.c
++++ b/src/groupadd.c
+@@ -102,6 +102,12 @@
+ static void check_flags (void);
+ static void check_perms (void);
+
++#ifndef EXTRAUSERS_OPT
++#define EXTRAUSERS_OPT 100000
++#endif
++
++static bool use_extrausers = false;
++
+ /*
+ * usage - display usage message and exit
+ */
+@@ -123,6 +129,7 @@
+ (void) fputs (_(" -p, --password PASSWORD use this encrypted password for the new group\n"), usageout);
+ (void) fputs (_(" -r, --system create a system account\n"), usageout);
+ (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout);
++ (void) fputs (_(" --extrausers Use the extra users database\n"), usageout);
+ (void) fputs ("\n", usageout);
+ exit (status);
+ }
+@@ -386,12 +393,16 @@
+ {"password", required_argument, NULL, 'p'},
+ {"system", no_argument, NULL, 'r'},
+ {"root", required_argument, NULL, 'R'},
++ {"extrausers", no_argument, NULL, EXTRAUSERS_OPT},
+ {NULL, 0, NULL, '\0'}
+ };
+
+ while ((c = getopt_long (argc, argv, "fg:hK:op:rR:",
+ long_options, NULL)) != -1) {
+ switch (c) {
++ case EXTRAUSERS_OPT:
++ use_extrausers = true;
++ break;
+ case 'f':
+ /*
+ * "force" - do nothing, just exit(0), if the
+@@ -598,7 +609,18 @@
+
+ check_perms ();
+
++ if (use_extrausers) {
++ fprintf (stderr, "ENTER EXTRAUSERS_GROUP_FILE");
++ gr_setdbname (EXTRAUSERS_GROUP_FILE);
++ fprintf (stderr, "EXIT EXTRAUSERS_GROUP_FILE");
++ }
++
+ #ifdef SHADOWGRP
++ if (use_extrausers) {
++ fprintf (stderr, "ENTER EXTRAUSERS_SHADOWGROUP_FILE");
++ sgr_setdbname (EXTRAUSERS_SHADOWGROUP_FILE);
++ fprintf (stderr, "EXIT EXTRAUSERS_SHADOWGROUP_FILE");
++ }
+ is_shadow_grp = sgr_file_present ();
+ #endif
+
+--- a/src/useradd.c
++++ b/src/useradd.c
+@@ -137,6 +137,12 @@
+ static gid_t sub_gid_start; /* New subordinate gid range */
+ static unsigned long sub_gid_count;
+
++#ifndef EXTRAUSERS_OPT
++#define EXTRAUSERS_OPT 100000
++#endif
++
++static bool use_extrausers = false;
++
+ static bool
+ bflg = false, /* new default root of home directory */
+ cflg = false, /* comment (GECOS) field for new account */
+@@ -770,6 +776,7 @@
+ #ifdef WITH_SELINUX
+ (void) fputs (_(" -Z, --selinux-user SEUSER use a specific SEUSER for the SELinux user mapping\n"), usageout);
+ #endif /* WITH_SELINUX */
++ (void) fputs (_(" --extrausers Use the extra users database\n"), usageout);
+ (void) fputs ("\n", usageout);
+ exit (status);
+ }
+@@ -1044,6 +1051,7 @@
+ #ifdef WITH_SELINUX
+ {"selinux-user", required_argument, NULL, 'Z'},
+ #endif /* WITH_SELINUX */
++ {"extrausers", no_argument, NULL, EXTRAUSERS_OPT},
+ {NULL, 0, NULL, '\0'}
+ };
+ while ((c = getopt_long (argc, argv,
+@@ -1054,6 +1062,9 @@
+ #endif /* !WITH_SELINUX */
+ long_options, NULL)) != -1) {
+ switch (c) {
++ case EXTRAUSERS_OPT:
++ use_extrausers = true;
++ break;
+ case 'b':
+ if ( ( !VALID (optarg) )
+ || ( optarg[0] != '/' )) {
+@@ -2104,6 +2115,18 @@
+ }
+ }
+
++ if (use_extrausers) {
++ pw_setdbname (EXTRAUSERS_PASSWD_FILE);
++ spw_setdbname (EXTRAUSERS_SHADOW_FILE);
++ gr_setdbname (EXTRAUSERS_GROUP_FILE);
++ /* TODO expose this information in other tools */
++ sub_uid_setdbname(EXTRAUSERS_SUBUID_FILE);
++ sub_gid_setdbname(EXTRAUSERS_SUBGID_FILE);
++#ifdef SHADOWGRP
++ sgr_setdbname (EXTRAUSERS_SHADOWGROUP_FILE);
++#endif
++ }
++
+ /*
+ * Do the hard stuff:
+ * - open the files,
diff -pruN 1:4.1.5.1-1.1ubuntu5/debian/patches/series 1:4.1.5.1-1.1ubuntu6/debian/patches/series
--- 1:4.1.5.1-1.1ubuntu5/debian/patches/series 2015-07-02 23:06:53.000000000 +0000
+++ 1:4.1.5.1-1.1ubuntu6/debian/patches/series 2015-07-02 23:06:52.000000000 +0000
@@ -37,3 +37,4 @@ userns/16_add-argument-sanity-checking.p
1000_configure_userns
1010_extrausers.patch
1020_fix_user_busy_errors
+1011_extrausers_toggle.patch
More information about the Pkg-shadow-devel
mailing list