[Pkg-shadow-devel] Ubuntu shadow 1:4.1.4.2+svn3283-2ubuntu2
Ubuntu Merge-o-Matic
mom at ubuntu.com
Tue Jan 4 19:31:30 UTC 2011
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: Tue, 04 Jan 2011 15:48:49 +0100
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.4.2+svn3283-2ubuntu2
Distribution: natty
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Oliver Grawert <ogra at ubuntu.com>
Description:
login - system login tools
passwd - change and administer password and group data
Changes:
shadow (1:4.1.4.2+svn3283-2ubuntu2) natty; urgency=low
.
* debian/patches/495_stdout-encrypted-password: adjust patch for changes
in src/chpasswd.c to fix FTBFS
Checksums-Sha1:
edb45a0d93b04a1b057cabde88b01c99d1b937d7 1689 shadow_4.1.4.2+svn3283-2ubuntu2.dsc
3bccabce6618380293143c074c6d7a08d5b7d7bf 333551 shadow_4.1.4.2+svn3283-2ubuntu2.diff.gz
Checksums-Sha256:
cb1f6c7c1cc0c606cb56308fb2e107bf048af8f996c5af9360838d441b72a93f 1689 shadow_4.1.4.2+svn3283-2ubuntu2.dsc
bcb44b7f195fa6dabb11c82214bde8517606b6a6f3e42e84a2a7dbd6c5320c60 333551 shadow_4.1.4.2+svn3283-2ubuntu2.diff.gz
Files:
02bfaeedbcd2a2dbee62a76e1be98cb9 1689 admin required shadow_4.1.4.2+svn3283-2ubuntu2.dsc
b546c3ceb2acf7980052ab130c975cc7 333551 admin required shadow_4.1.4.2+svn3283-2ubuntu2.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.4.2+svn3283-2ubuntu1/debian/changelog 1:4.1.4.2+svn3283-2ubuntu2/debian/changelog
--- 1:4.1.4.2+svn3283-2ubuntu1/debian/changelog 2011-01-04 19:15:34.000000000 +0000
+++ 1:4.1.4.2+svn3283-2ubuntu2/debian/changelog 2011-01-04 19:15:33.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.1.4.2+svn3283-2ubuntu2) natty; urgency=low
+
+ * debian/patches/495_stdout-encrypted-password: adjust patch for changes
+ in src/chpasswd.c to fix FTBFS
+
+ -- Oliver Grawert <ogra at ubuntu.com> Tue, 04 Jan 2011 15:48:49 +0100
+
shadow (1:4.1.4.2+svn3283-2ubuntu1) natty; urgency=low
* Merge from debian unstable. Remaining changes:
diff -pruN 1:4.1.4.2+svn3283-2ubuntu1/debian/patches/495_stdout-encrypted-password 1:4.1.4.2+svn3283-2ubuntu2/debian/patches/495_stdout-encrypted-password
--- 1:4.1.4.2+svn3283-2ubuntu1/debian/patches/495_stdout-encrypted-password 2011-01-04 19:15:34.000000000 +0000
+++ 1:4.1.4.2+svn3283-2ubuntu2/debian/patches/495_stdout-encrypted-password 2011-01-04 19:15:33.000000000 +0000
@@ -1,173 +1,130 @@
-Description: allow chpasswd to report a correctly hashed password (using
- system defaults for hash mechanism) to stdout.
-Upstream: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505640
-
-Index: shadow-4.1.4.1/src/chpasswd.c
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: shadow-4.1.4.2+svn3283/man/chpasswd.8.xml
===================================================================
---- shadow-4.1.4.1.orig/src/chpasswd.c
-+++ shadow-4.1.4.1/src/chpasswd.c
-@@ -54,7 +54,6 @@
- * Global variables
- */
- char *Prog;
--#ifndef USE_PAM
- static bool cflg = false;
- static bool eflg = false;
- static bool md5flg = false;
-@@ -70,7 +69,8 @@
- static bool is_shadow_pwd;
+--- shadow-4.1.4.2+svn3283.orig/man/chpasswd.8.xml 2011-01-04 15:48:30.000000000 +0100
++++ shadow-4.1.4.2+svn3283/man/chpasswd.8.xml 2011-01-04 15:48:16.000000000 +0100
+@@ -147,6 +147,12 @@
+ </variablelist>
+ <variablelist remap='IP'>
+ <varlistentry>
++ <term><option>-S</option>, <option>--stdout</option></term>
++ <listitem>
++ <para>Report encrypted passwords to stdout instead of updating password file.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
+ <term><option>-h</option>, <option>--help</option></term>
+ <listitem>
+ <para>Display help message and exit.</para>
+Index: shadow-4.1.4.2+svn3283/src/chpasswd.c
+===================================================================
+--- shadow-4.1.4.2+svn3283.orig/src/chpasswd.c 2011-01-04 15:48:19.000000000 +0100
++++ shadow-4.1.4.2+svn3283/src/chpasswd.c 2011-01-04 15:45:58.000000000 +0100
+@@ -70,6 +70,8 @@
static bool pw_locked = false;
static bool spw_locked = false;
--#endif /* !USE_PAM */
-+
-+static int use_stdout = 0;
++static int use_stdout = 0;
++
/* local function prototypes */
static void fail_exit (int code);
-@@ -141,6 +141,9 @@
- stderr);
+ static void usage (int status);
+@@ -132,6 +134,9 @@
+ " crypt algorithms\n"),
+ usageout);
#endif /* USE_SHA_CRYPT */
- #endif /* !USE_PAM */
-+ (void) fputs (_(" -S, --stdout report encrypted passwords to stdout\n"
-+ " instead of changing the passwd file\n"),
-+ stderr);
- (void) fputs ("\n", stderr);
-
- exit (E_USAGE);
-@@ -164,6 +167,7 @@
++ (void) fputs (_(" -S, --stdout report encrypted passwords to stdout\n"
++ " instead of changing the passwd file\n"),
++ usageout);
+ (void) fputs ("\n", usageout);
+
+ exit (status);
+@@ -153,15 +158,16 @@
+ #ifdef USE_SHA_CRYPT
{"sha-rounds", required_argument, NULL, 's'},
#endif /* USE_SHA_CRYPT */
- #endif /* !USE_PAM */
+ {"stdout", no_argument, NULL, 'S'},
{"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, '\0'}
};
-@@ -171,12 +175,12 @@
+
while ((c = getopt_long (argc, argv,
- #ifndef USE_PAM
- # ifdef USE_SHA_CRYPT
+ #ifdef USE_SHA_CRYPT
- "c:ehms:",
+ "c:ehms:S",
- # else /* !USE_SHA_CRYPT */
+ #else /* !USE_SHA_CRYPT */
- "c:ehm",
+ "c:ehmS",
- # endif /* !USE_SHA_CRYPT */
- #else
-- "h",
-+ "hS",
- #endif /* !USE_PAM */
+ #endif /* !USE_SHA_CRYPT */
long_options, &option_index)) != -1) {
switch (c) {
-@@ -206,6 +210,9 @@
+@@ -189,6 +195,9 @@
+ }
break;
#endif /* USE_SHA_CRYPT */
- #endif /* !USE_PAM */
-+ case 'S':
-+ use_stdout = 1;
-+ break;
++ case 'S':
++ use_stdout = 1;
++ break;
default:
- usage ();
+ usage (E_USAGE);
break;
-@@ -271,6 +278,7 @@
+@@ -252,6 +261,7 @@
*/
static void check_perms (void)
{
+ if (use_stdout) return;
#ifdef USE_PAM
#ifdef ACCT_TOOLS_SETUID
- pam_handle_t *pamh = NULL;
-@@ -412,6 +420,7 @@
+ /* If chpasswd uses PAM and is SUID, check the permissions,
+@@ -397,17 +407,19 @@
OPENLOG ("chpasswd");
+ if (!use_stdout) {
check_perms ();
- #ifndef USE_PAM
-@@ -419,6 +428,7 @@
+ #ifdef USE_PAM
+- if (!use_pam)
++ if (!use_pam) {
+ #endif /* USE_PAM */
+- {
+ is_shadow_pwd = spw_file_present ();
- open_files ();
- #endif
+ open_files ();
++#ifdef USE_PAM
+ }
-
++#endif /* USE_PAM */
+ }
+-
/*
* Read each line, separating the user name from the password. The
-@@ -467,13 +477,14 @@
- newpwd = cp;
-
- #ifdef USE_PAM
-- if (do_pam_passwd_non_interractive ("chpasswd", name, newpwd) != 0) {
-- fprintf (stderr,
-- _("%s: (line %d, user %s) password not changed\n"),
-- Prog, line, name);
-- errors++;
-- }
--#else /* !USE_PAM */
-+ /* Even if we would normally be using PAM, use_stdout
-+ * requires us to compute the password ourselves. This
-+ * requires our ENCRYPT_METHOD to be in sync with PAM so
-+ * needs to be reworked, but for now that's better than the
-+ * rest of the system having to be in sync with PAM too.
-+ */
-+ if (use_stdout) {
-+#endif
- if ( !eflg
- && ( (NULL == crypt_method)
- || (0 != strcmp (crypt_method, "NONE")))) {
-@@ -492,6 +503,24 @@
+ * password entry for each user will be looked up in the appropriate
+@@ -488,6 +500,10 @@
cp = pw_encrypt (newpwd,
crypt_make_salt(crypt_method, arg));
}
-+#ifdef USE_PAM
-+ }
-+#endif
-+
+ if (use_stdout) {
-+ fprintf (stdout, "%s:%s\n", name, cp);
-+ continue;
-+ }
-+
-+#ifdef USE_PAM
-+ if (do_pam_passwd_non_interractive ("chpasswd", name, newpwd) != 0) {
-+ fprintf (stderr,
-+ _("%s: (line %d, user %s) password not changed\n"),
-+ Prog, line, name);
-+ errors++;
-+ continue;
++ fprintf (stdout, "%s:%s\n", name, cp);
++ continue;
+ }
-+#else /* !USE_PAM */
/*
* Get the password file entry for this user. The user must
-@@ -573,12 +602,14 @@
+@@ -573,6 +589,7 @@
fail_exit (1);
}
+ if (!use_stdout) {
- #ifndef USE_PAM
- /* Save the changes */
- close_files ();
- #endif
+ #ifdef USE_PAM
+ if (!use_pam)
+ #endif /* USE_PAM */
+@@ -582,6 +599,7 @@
+ }
nscd_flush_cache ("passwd");
+ }
return (0);
}
-Index: shadow-4.1.4.1/man/chpasswd.8.xml
-===================================================================
---- shadow-4.1.4.1.orig/man/chpasswd.8.xml
-+++ shadow-4.1.4.1/man/chpasswd.8.xml
-@@ -134,6 +134,12 @@
- </variablelist>
- <variablelist remap='IP'>
- <varlistentry>
-+ <term><option>-S</option>, <option>--stdout</option></term>
-+ <listitem>
-+ <para>Report encrypted passwords to stdout instead of updating password file.</para>
-+ </listitem>
-+ </varlistentry>
-+ <varlistentry>
- <term><option>-h</option>, <option>--help</option></term>
- <listitem>
- <para>Display help message and exit.</para>
More information about the Pkg-shadow-devel
mailing list