The branch, v3-6-test has been updated
via 4d2ff96 s3-param: Fixed code block in max_open_files().
via 16eea76 s3-smbd: Fixed a possible null pointer dereference. (cherry
picked from commit 7a97518e12054e1f84236501322b756c5c09d7dd)
from fb05a07 s3: Add wbinfo --dc-info
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 4d2ff96823d4e15d5e39eee71802ae57fd308a19
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 19 16:13:42 2011 +0100
s3-param: Fixed code block in max_open_files().
When the HAVE_GETRLIMIT and RLIMIT_NOFILE macros are defined the block
isn't closed.
Autobuild-User: Andreas Schneider <a...@samba.org>
Autobuild-Date: Wed Jan 19 23:10:50 CET 2011 on sn-devel-104
(cherry picked from commit 4744da8762c492654204b0ee0b3c47631f44ce29)
commit 16eea763590f151bd15ac6c0afaa82fbaad0ba4f
Author: Andreas Schneider <a...@samba.org>
Date: Wed Jan 19 16:22:28 2011 +0100
s3-smbd: Fixed a possible null pointer dereference.
(cherry picked from commit 7a97518e12054e1f84236501322b756c5c09d7dd)
-----------------------------------------------------------------------
Summary of changes:
source3/param/loadparm.c | 2 +-
source3/smbd/uid.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2f68f00..875cab1 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4893,8 +4893,8 @@ static int max_open_files(void)
#if defined(RLIM_INFINITY)
if(rl.rlim_cur == RLIM_INFINITY)
rlimit_max = MAX_OPEN_FILES;
- }
#endif
+ }
#endif
if (sysctl_max < MIN_OPEN_FILES_WINDOWS) {
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index dd6af6d..b573a6c 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -229,7 +229,7 @@ void conn_clear_vuid_cache(connection_struct *conn,
uint16_t vuid)
bool change_to_user(connection_struct *conn, uint16 vuid)
{
const struct auth_serversupplied_info *server_info = NULL;
- user_struct *vuser = get_valid_user_struct(conn->sconn, vuid);
+ user_struct *vuser;
int snum;
gid_t gid;
uid_t uid;
@@ -242,6 +242,8 @@ bool change_to_user(connection_struct *conn, uint16 vuid)
return(False);
}
+ vuser = get_valid_user_struct(conn->sconn, vuid);
+
/*
* We need a separate check in security=share mode due to vuid
* always being UID_FIELD_INVALID. If we don't do this then
--
Samba Shared Repository
