The branch, v3-6-stable has been updated
via 4b0054c s3: Fix Coverity ID 2472, UNINIT
via 18aeb12 s3: Fix Coverity ID 2473, UNINIT
via 69789d3 s3: Fix timeout calculation in event_add_to_poll_args
via 271e6c7 s3-modules: Fix debug message
via 48a87f4 release-scripts/create-tarball: also remove the toplevel
configure.developer
from 14d7379 VERSION: Adapt version string.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable
- Log -----------------------------------------------------------------
commit 4b0054c752b7b3b50a5f550068365356b79da49d
Author: Volker Lendecke <v...@samba.org>
Date: Fri Apr 8 11:07:11 2011 +0200
s3: Fix Coverity ID 2472, UNINIT
Signed-off-by: Günther Deschner <g...@samba.org>
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Mon Apr 11 17:14:35 CEST 2011 on sn-devel-104
(cherry picked from commit 5cd6d93fa1f24b64b449455da40d5c83a18a8cff)
(cherry picked from commit 5a64930c2fee729e13f61ae0cef1a4f88a49e5c2)
commit 18aeb127d88b922bfc5fc26b052baa859d8b9b41
Author: Volker Lendecke <v...@samba.org>
Date: Fri Apr 8 11:07:11 2011 +0200
s3: Fix Coverity ID 2473, UNINIT
Signed-off-by: Günther Deschner <g...@samba.org>
(cherry picked from commit d2d1d173237906f77b68b3d04add007e92fe2d34)
(cherry picked from commit 7b87f84d8e71348811433291f8263a6c66bf87ff)
commit 69789d392e4db859cd6a41e98c1a55ab2b55b93d
Author: Volker Lendecke <v...@samba.org>
Date: Mon Apr 11 13:37:42 2011 +0200
s3: Fix timeout calculation in event_add_to_poll_args
In the initial phase nmbd does not yet have timed events. This led to nmbd
not correctly registering its names in make test and certainly everywhere
else.
Autobuild-User: Volker Lendecke <vlen...@samba.org>
Autobuild-Date: Mon Apr 11 14:35:45 CEST 2011 on sn-devel-104
(cherry picked from commit 09586950225e880bbd6d9e147c884c5886c4d0a4)
(cherry picked from commit 246657b06e518674129abc7f0c141c3e85d9cc8b)
commit 271e6c71bbf30619790f9ce6d224e6d4114c4066
Author: Björn Baumbach <b...@sernet.de>
Date: Mon Apr 11 10:27:58 2011 +0200
s3-modules: Fix debug message
Print child descriptor instead of parent.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User: Stefan Metzmacher <me...@samba.org>
Autobuild-Date: Mon Apr 11 11:48:42 CEST 2011 on sn-devel-104
(cherry picked from commit e6cf92c574fba14132757f141d8b1242fa71be88)
(cherry picked from commit 42ad7630259829f1c40d9d0fcf5376fa007568a3)
commit 48a87f4807a3a7bdf9b97e74bb5899328848f9ab
Author: Stefan Metzmacher <me...@samba.org>
Date: Mon Apr 11 11:54:21 2011 +0200
release-scripts/create-tarball: also remove the toplevel configure.developer
metze
(cherry picked from commit 7f14129570fe5c61c8eae9550e725e924cb12db4)
-----------------------------------------------------------------------
Summary of changes:
release-scripts/create-tarball | 2 +-
source3/lib/events.c | 2 +-
source3/modules/vfs_acl_common.c | 2 +-
source3/passdb/pdb_ipa.c | 6 ++----
4 files changed, 5 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index d634f2b..4eec87b 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -220,7 +220,7 @@ function main
/bin/rm -f source4/ldap_server/devdocs/ldapext-ldapv3-vlv-04.txt
fi
- /bin/rm -f Makefile configure
+ /bin/rm -f Makefile configure configure.developer
packaging/bin/update-pkginfo ${version} 1 ""
diff --git a/source3/lib/events.c b/source3/lib/events.c
index d19c79e..e461ebe 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -166,7 +166,7 @@ bool event_add_to_poll_args(struct tevent_context *ev,
TALLOC_CTX *mem_ctx,
return true;
}
if (ev->timer_events == NULL) {
- *ptimeout = INT_MAX;
+ *ptimeout = MIN(*ptimeout, INT_MAX);
return true;
}
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index f8265c5..99edbda 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -474,7 +474,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
if (DEBUGLEVEL >= 10) {
DEBUG(10,("inherit_new_acl: child acl for %s is:\n",
fsp_str_dbg(fsp) ));
- NDR_PRINT_DEBUG(security_descriptor, parent_desc);
+ NDR_PRINT_DEBUG(security_descriptor, psd);
}
return SMB_VFS_FSET_NT_ACL(fsp,
diff --git a/source3/passdb/pdb_ipa.c b/source3/passdb/pdb_ipa.c
index f118e6e..da8e9f0 100644
--- a/source3/passdb/pdb_ipa.c
+++ b/source3/passdb/pdb_ipa.c
@@ -973,7 +973,6 @@ static NTSTATUS ipasam_add_posix_account_objectclass(struct
ldapsam_privates *ld
{
int ret;
LDAPMod **mods = NULL;
- NTSTATUS status;
smbldap_set_mod(&mods, LDAP_MOD_ADD,
"objectclass", "posixAccount");
@@ -995,7 +994,7 @@ static NTSTATUS ipasam_add_posix_account_objectclass(struct
ldapsam_privates *ld
if (ret != LDAP_SUCCESS) {
DEBUG(1, ("failed to modify/add user with uid = %s (dn = %s)\n",
username, dn));
- return status;
+ return NT_STATUS_LDAP(ret);
}
return NT_STATUS_OK;
@@ -1064,7 +1063,6 @@ static NTSTATUS ipasam_add_ipa_objectclasses(struct
ldapsam_privates *ldap_state
uint32_t has_objectclass)
{
LDAPMod **mods = NULL;
- NTSTATUS status;
int ret;
char *princ;
@@ -1128,7 +1126,7 @@ static NTSTATUS ipasam_add_ipa_objectclasses(struct
ldapsam_privates *ldap_state
if (ret != LDAP_SUCCESS) {
DEBUG(1, ("failed to modify/add user with uid = %s (dn
= %s)\n",
name, dn));
- return status;
+ return NT_STATUS_LDAP(ret);
}
}
--
Samba Shared Repository
