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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-03-09 09:53:50 +0000 (Sun, 09 Mar 2008)
New Revision: 1752

Removed:
   trunk/samba/debian/patches/get_global_sam_sid-non-root.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
This patch was applied upstream as well


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

Deleted: trunk/samba/debian/patches/get_global_sam_sid-non-root.patch
===================================================================
--- trunk/samba/debian/patches/get_global_sam_sid-non-root.patch	2008-03-09 09:46:48 UTC (rev 1751)
+++ trunk/samba/debian/patches/get_global_sam_sid-non-root.patch	2008-03-09 09:53:50 UTC (rev 1752)
@@ -1,73 +0,0 @@
-Goal: client programs should short-circuit before calling
-get_global_sam_sid() as not-root, because the SAM SID can't be read without
-root privileges and get_global_sam_sid() panics when it can't be accessed --
-reasonable for the server, not reasonable for the client.
-
-Author: Steve Langasek <vorlon at debian.org>
-
-Upstream status: submitted in bugzilla bug #3727. Will be in 3.0.28a
-
-Index: samba-3.0.26a/source/utils/smbpasswd.c
-===================================================================
---- samba-3.0.26a.orig/source/utils/smbpasswd.c
-+++ samba-3.0.26a/source/utils/smbpasswd.c
-@@ -96,6 +96,10 @@
- 	while ((ch = getopt(argc, argv, "c:axdehminjr:sw:R:D:U:LW")) != EOF) {
- 		switch(ch) {
- 		case 'L':
-+			if (getuid() != 0) {
-+				fprintf(stderr, "smbpasswd -L can only be used by root.\n");
-+				exit(1);
-+			}
- 			local_flags |= LOCAL_AM_ROOT;
- 			break;
- 		case 'c':
-Index: samba-3.0.26a/source/pam_smbpass/pam_smb_auth.c
-===================================================================
---- samba-3.0.26a.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.0.26a/source/pam_smbpass/pam_smb_auth.c
-@@ -100,6 +100,12 @@
- 		_log_err(pamh, LOG_DEBUG, "username [%s] obtained", name);
- 	}
- 
-+	if (geteuid() != 0) {
-+		_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+		retval = PAM_AUTHINFO_UNAVAIL;
-+		AUTH_RETURN;
-+	}
-+
- 	if (!initialize_password_db(True)) {
- 		_log_err(pamh, LOG_ALERT, "Cannot access samba password database");
- 		retval = PAM_AUTHINFO_UNAVAIL;
-Index: samba-3.0.26a/source/pam_smbpass/pam_smb_acct.c
-===================================================================
---- samba-3.0.26a.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.0.26a/source/pam_smbpass/pam_smb_acct.c
-@@ -69,6 +69,11 @@
- 		_log_err(pamh, LOG_DEBUG, "acct: username [%s] obtained", name);
- 	}
- 
-+	if (geteuid() != 0) {
-+		_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+		return PAM_AUTHINFO_UNAVAIL;
-+	}
-+
- 	/* Getting into places that might use LDAP -- protect the app
- 		from a SIGPIPE it's not expecting */
- 	oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
-Index: samba-3.0.26a/source/pam_smbpass/pam_smb_passwd.c
-===================================================================
---- samba-3.0.26a.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.0.26a/source/pam_smbpass/pam_smb_passwd.c
-@@ -124,6 +124,11 @@
-         _log_err(pamh, LOG_DEBUG, "username [%s] obtained", user);
-     }
- 
-+    if (geteuid() != 0) {
-+	_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+	return PAM_AUTHINFO_UNAVAIL;
-+    }
-+
-     /* Getting into places that might use LDAP -- protect the app
-        from a SIGPIPE it's not expecting */
-     oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2008-03-09 09:46:48 UTC (rev 1751)
+++ trunk/samba/debian/patches/series	2008-03-09 09:53:50 UTC (rev 1752)
@@ -13,7 +13,6 @@
 adapt_machine_creation_script.patch
 autoconf.patch
 smbpasswd-syslog.patch
-get_global_sam_sid-non-root.patch
 usershare.patch
 chgpasswd.patch
 cups.patch