[Pkg-samba-maint] r4060 - in branches/samba/backports.org/squeeze: . debian packaging/RHEL packaging/RHEL-CTDB source3 source3/include source3/rpc_server/lsa
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Tue May 1 18:33:36 UTC 2012
Author: bubulle
Date: 2012-05-01 18:33:36 +0000 (Tue, 01 May 2012)
New Revision: 4060
Modified:
branches/samba/backports.org/squeeze/WHATSNEW.txt
branches/samba/backports.org/squeeze/debian/changelog
branches/samba/backports.org/squeeze/debian/control
branches/samba/backports.org/squeeze/debian/samba-common.config
branches/samba/backports.org/squeeze/debian/samba-common.postrm
branches/samba/backports.org/squeeze/debian/samba.config
branches/samba/backports.org/squeeze/debian/samba.postinst
branches/samba/backports.org/squeeze/debian/samba.postrm
branches/samba/backports.org/squeeze/debian/swat.postinst
branches/samba/backports.org/squeeze/debian/swat.postrm
branches/samba/backports.org/squeeze/debian/winbind.postrm
branches/samba/backports.org/squeeze/packaging/RHEL-CTDB/samba.spec
branches/samba/backports.org/squeeze/packaging/RHEL/makerpms.sh
branches/samba/backports.org/squeeze/packaging/RHEL/samba.spec
branches/samba/backports.org/squeeze/source3/VERSION
branches/samba/backports.org/squeeze/source3/include/version.h
branches/samba/backports.org/squeeze/source3/rpc_server/lsa/srv_lsa_nt.c
Log:
Merge from trunk
Modified: branches/samba/backports.org/squeeze/WHATSNEW.txt
===================================================================
--- branches/samba/backports.org/squeeze/WHATSNEW.txt 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/WHATSNEW.txt 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,4 +1,51 @@
=============================
+ Release Notes for Samba 3.6.5
+ April 30, 2012
+ =============================
+
+
+This is a security release in order to address
+CVE-2012-2111 (Incorrect permission checks when granting/removing
+privileges can compromise file server security).
+
+o CVE-2012-2111:
+ Samba 3.4.x to 3.6.4 are affected by a
+ vulnerability that allows arbitrary users
+ to modify privileges on a file server.
+
+
+Changes since 3.6.4:
+--------------------
+
+
+o Jeremy Allison <jra at samba.org>
+ * Fix incorrect permission checks when granting/removing
+ privileges (CVE-2012-2111).
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 3.6 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+Release notes for older releases follow:
+----------------------------------------
+
+ =============================
Release Notes for Samba 3.6.4
April 10, 2012
=============================
@@ -41,9 +88,10 @@
== The Samba Team
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
+
=============================
Release Notes for Samba 3.6.3
January 29, 2012
Modified: branches/samba/backports.org/squeeze/debian/changelog
===================================================================
--- branches/samba/backports.org/squeeze/debian/changelog 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/changelog 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,9 +1,29 @@
-samba (2:3.6.4-1~bpo60+1) squeeze-backports; urgency=high
+samba (2:3.6.5-1~bpo60+1) squeeze-backports; urgency=high
* Backport to squeeze. Security fix for backports users
+ * Build-Depend on debhelper >= 8~ (squeeze compatibility)
-- Christian Perrier <bubulle at debian.org> Fri, 13 Apr 2012 20:04:30 +0200
+samba (2:3.6.5-1) unstable; urgency=low
+
+ * New upstream release. Fixes CVE-2012-2111: Incorrect permission
+ checks when granting/removing privileges can compromise file
+ server security.
+ * Build-Depend on debhelper >= 9~ (which is in unstable for a few
+ months now)
+ * Use "set -e" in maintainer scripts instead of passing -e in the
+ shebang line
+ * Update Standards to 3.9.3 (checked, no change)
+
+ -- Christian Perrier <bubulle at debian.org> Tue, 01 May 2012 08:07:39 +0200
+
+samba (2:3.6.4-1~bpo60+1) squeeze-backports; urgency=high
+
+ * Backport to squeeze. Security fix for backports users
+
+ -- Christian Perrier <bubulle at debian.org> Fri, 13 Apr 2012 20:04:30 +0200
+
samba (2:3.6.4-1) unstable; urgency=low
[ Christian Perrier ]
Modified: branches/samba/backports.org/squeeze/debian/control
===================================================================
--- branches/samba/backports.org/squeeze/debian/control 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/control 2012-05-01 18:33:36 UTC (rev 4060)
@@ -14,7 +14,7 @@
libctdb-dev (>= 1.10+git20110412) [linux-any],
pkg-config
Build-Conflicts: libfam-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.samba.org
Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba/
Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba
Modified: branches/samba/backports.org/squeeze/debian/samba-common.config
===================================================================
--- branches/samba/backports.org/squeeze/debian/samba-common.config 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/samba-common.config 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,5 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
# Source debconf library.
. /usr/share/debconf/confmodule
Modified: branches/samba/backports.org/squeeze/debian/samba-common.postrm
===================================================================
--- branches/samba/backports.org/squeeze/debian/samba-common.postrm 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/samba-common.postrm 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,5 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
if [ "$1" = purge ]; then
rm -rf /etc/samba/ /var/cache/samba/ /var/lib/samba/ /var/run/samba/
if [ -x "`which ucf 2>/dev/null`" ]; then
Modified: branches/samba/backports.org/squeeze/debian/samba.config
===================================================================
--- branches/samba/backports.org/squeeze/debian/samba.config 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/samba.config 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,7 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh
#
#
+set -e
# Source debconf library.
. /usr/share/debconf/confmodule
Modified: branches/samba/backports.org/squeeze/debian/samba.postinst
===================================================================
--- branches/samba/backports.org/squeeze/debian/samba.postinst 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/samba.postinst 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,9 +1,10 @@
-#!/bin/sh -e
+#!/bin/sh
#
# Post-installation script for the Samba package for Debian GNU/Linux
#
#
+set -e
# Handle debconf
. /usr/share/debconf/confmodule
Modified: branches/samba/backports.org/squeeze/debian/samba.postrm
===================================================================
--- branches/samba/backports.org/squeeze/debian/samba.postrm 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/samba.postrm 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,5 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
if [ "$1" = purge ]; then
rm -rf /var/cache/samba/browse.dat
rm -rf /var/lib/samba/printers/
Modified: branches/samba/backports.org/squeeze/debian/swat.postinst
===================================================================
--- branches/samba/backports.org/squeeze/debian/swat.postinst 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/swat.postinst 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,5 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
action="$1"
oldversion="$2"
Modified: branches/samba/backports.org/squeeze/debian/swat.postrm
===================================================================
--- branches/samba/backports.org/squeeze/debian/swat.postrm 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/swat.postrm 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,7 +1,6 @@
-#!/bin/sh -e
-#
-#
+#!/bin/sh
+set -e
case "$1" in
purge)
if [ -x /usr/sbin/update-inetd ]; then
Modified: branches/samba/backports.org/squeeze/debian/winbind.postrm
===================================================================
--- branches/samba/backports.org/squeeze/debian/winbind.postrm 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/debian/winbind.postrm 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,5 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
if [ "$1" = purge ]; then
rm -rf /var/cache/samba/netsamlogon_cache.tdb /var/cache/samba/winbindd_cache.tdb
rm -rf /var/log/samba/log.winbind* /var/log/samba/log.wb*
Modified: branches/samba/backports.org/squeeze/packaging/RHEL/makerpms.sh
===================================================================
--- branches/samba/backports.org/squeeze/packaging/RHEL/makerpms.sh 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/packaging/RHEL/makerpms.sh 2012-05-01 18:33:36 UTC (rev 4060)
@@ -20,7 +20,7 @@
USERID=`id -u`
GRPID=`id -g`
-VERSION='3.6.4'
+VERSION='3.6.5'
REVISION=''
SPECFILE="samba.spec"
RPMVER=`rpm --version | awk '{print $3}'`
Modified: branches/samba/backports.org/squeeze/packaging/RHEL/samba.spec
===================================================================
--- branches/samba/backports.org/squeeze/packaging/RHEL/samba.spec 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/packaging/RHEL/samba.spec 2012-05-01 18:33:36 UTC (rev 4060)
@@ -11,7 +11,7 @@
Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
-Version: 3.6.4
+Version: 3.6.5
Release: 1
Epoch: 0
License: GNU GPL version 3
Modified: branches/samba/backports.org/squeeze/packaging/RHEL-CTDB/samba.spec
===================================================================
--- branches/samba/backports.org/squeeze/packaging/RHEL-CTDB/samba.spec 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/packaging/RHEL-CTDB/samba.spec 2012-05-01 18:33:36 UTC (rev 4060)
@@ -5,7 +5,7 @@
Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
-Version: 3.6.4
+Version: 3.6.5
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
Modified: branches/samba/backports.org/squeeze/source3/VERSION
===================================================================
--- branches/samba/backports.org/squeeze/source3/VERSION 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/source3/VERSION 2012-05-01 18:33:36 UTC (rev 4060)
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=4
+SAMBA_VERSION_RELEASE=5
########################################################
# Bug fix releases use a letter for the patch revision #
Modified: branches/samba/backports.org/squeeze/source3/include/version.h
===================================================================
--- branches/samba/backports.org/squeeze/source3/include/version.h 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/source3/include/version.h 2012-05-01 18:33:36 UTC (rev 4060)
@@ -1,8 +1,8 @@
/* Autogenerated by script/mkversion.sh */
#define SAMBA_VERSION_MAJOR 3
#define SAMBA_VERSION_MINOR 6
-#define SAMBA_VERSION_RELEASE 4
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.4"
+#define SAMBA_VERSION_RELEASE 5
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.5"
#ifdef SAMBA_VERSION_VENDOR_FUNCTION
# define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
Modified: branches/samba/backports.org/squeeze/source3/rpc_server/lsa/srv_lsa_nt.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/rpc_server/lsa/srv_lsa_nt.c 2012-05-01 18:04:28 UTC (rev 4059)
+++ branches/samba/backports.org/squeeze/source3/rpc_server/lsa/srv_lsa_nt.c 2012-05-01 18:33:36 UTC (rev 4060)
@@ -2448,6 +2448,10 @@
uint32_t acc_granted;
struct security_descriptor *psd;
size_t sd_size;
+ uint32_t owner_access = (LSA_ACCOUNT_ALL_ACCESS &
+ ~(LSA_ACCOUNT_ADJUST_PRIVILEGES|
+ LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|
+ SEC_STD_DELETE));
/* find the connection policy handle. */
if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
@@ -2473,7 +2477,7 @@
status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
&lsa_account_mapping,
- r->in.sid, LSA_POLICY_ALL_ACCESS);
+ r->in.sid, owner_access);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@@ -2514,6 +2518,10 @@
size_t sd_size;
uint32_t des_access = r->in.access_mask;
uint32_t acc_granted;
+ uint32_t owner_access = (LSA_ACCOUNT_ALL_ACCESS &
+ ~(LSA_ACCOUNT_ADJUST_PRIVILEGES|
+ LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|
+ SEC_STD_DELETE));
NTSTATUS status;
/* find the connection policy handle. */
@@ -2538,7 +2546,7 @@
/* get the generic lsa account SD until we store it */
status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
&lsa_account_mapping,
- r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+ r->in.sid, owner_access);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@@ -2886,7 +2894,7 @@
/* get the generic lsa account SD for this SID until we store it */
status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
&lsa_account_mapping,
- r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+ NULL, 0);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@@ -2957,7 +2965,7 @@
/* get the generic lsa account SD for this SID until we store it */
status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
&lsa_account_mapping,
- r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+ NULL, 0);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
More information about the Pkg-samba-maint
mailing list