[Pkg-samba-maint] r1753 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-03-09 09:56:42 +0000 (Sun, 09 Mar 2008)
New Revision: 1753

Removed:
   trunk/samba/debian/patches/chgpasswd.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Patch applied upstream


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-03-09 09:53:50 UTC (rev 1752)
+++ trunk/samba/debian/changelog	2008-03-09 09:56:42 UTC (rev 1753)
@@ -8,6 +8,7 @@
     - linux-cifs-user-perms.patch
     - cifs-umount-same-user.patch
     - get_global_sam_sid-non-root.patch
+    - chgpasswd.patch
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 09 Mar 2008 08:57:28 +0100
 

Deleted: trunk/samba/debian/patches/chgpasswd.patch
===================================================================
--- trunk/samba/debian/patches/chgpasswd.patch	2008-03-09 09:53:50 UTC (rev 1752)
+++ trunk/samba/debian/patches/chgpasswd.patch	2008-03-09 09:56:42 UTC (rev 1753)
@@ -1,51 +0,0 @@
-Goal: Recent versions of Linux-PAM support localization of user prompts,
-so Samba must use the C locale when invoking PAM (directly or via
-/usr/bin/passwd) to ensure that password chat values match the prompts in a
-locale-invariant fashion.
-
-Authors: Mathias Gug <mathiaz at ubuntu.com>,
-         Steve Langasek <vorlon at debian.org>
-
-Upstream status: submitted in bugzilla bug #5082
-
-Index: samba-3.0.26a/source/smbd/chgpasswd.c
-===================================================================
---- samba-3.0.26a.orig/source/smbd/chgpasswd.c
-+++ samba-3.0.26a/source/smbd/chgpasswd.c
-@@ -126,6 +126,7 @@
- 	struct termios stermios;
- 	gid_t gid;
- 	uid_t uid;
-+	char *eptrs[1] = { NULL };
- 
- 	if (pass == NULL)
- 	{
-@@ -222,7 +223,7 @@
- 	       passwordprogram));
- 
- 	/* execl() password-change application */
--	if (execl("/bin/sh", "sh", "-c", passwordprogram, NULL) < 0)
-+	if (execle("/bin/sh", "sh", "-c", passwordprogram, NULL, eptrs) < 0)
- 	{
- 		DEBUG(3, ("Bad status returned from %s\n", passwordprogram));
- 		return (False);
-@@ -498,6 +499,9 @@
- #ifdef WITH_PAM
- 	if (lp_pam_password_change()) {
- 		BOOL ret;
-+#ifdef HAVE_SETLOCALE
-+		char *prevlocale = setlocale(LC_MESSAGES, "C");
-+#endif
- 
- 		if (as_root)
- 			become_root();
-@@ -511,6 +515,9 @@
- 		if (as_root)
- 			unbecome_root();
- 
-+#ifdef HAVE_SETLOCALE
-+		setlocale(LC_MESSAGES, prevlocale);
-+#endif
- 		return ret;
- 	}
- #endif

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2008-03-09 09:53:50 UTC (rev 1752)
+++ trunk/samba/debian/patches/series	2008-03-09 09:56:42 UTC (rev 1753)
@@ -14,7 +14,6 @@
 autoconf.patch
 smbpasswd-syslog.patch
 usershare.patch
-chgpasswd.patch
 cups.patch
 disable-weak-auth.patch
 gcc42-arm-workaround.patch