The branch, master has been updated via 57990cb s3:libsmb fix a potential crash via 7a61829 s3:vfs_gpfs: fix build after recent VFS changes via 99b5c75 s3:auth fix a compiler warning from c0d4f24 s4-python: Formatting fixes, break lines.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 57990cbcbbdf83d7b9997ac1fd33528c63c96226 Author: Christian Ambach <a...@samba.org> Date: Sun Sep 16 00:15:21 2012 +0200 s3:libsmb fix a potential crash Signed-off-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Christian Ambach <a...@samba.org> Autobuild-Date(master): Sun Sep 16 22:31:38 CEST 2012 on sn-devel-104 commit 7a6182962966e5edb42728c8d0a4d471a69c83d7 Author: Christian Ambach <a...@samba.org> Date: Sat Sep 15 22:57:51 2012 +0200 s3:vfs_gpfs: fix build after recent VFS changes commit 99b5c75974dd904644054433a3c3ad46a4ffc498 Author: Christian Ambach <a...@samba.org> Date: Sat Sep 15 22:47:06 2012 +0200 s3:auth fix a compiler warning ----------------------------------------------------------------------- Summary of changes: source3/auth/token_util.c | 5 ++--- source3/libsmb/pylibsmb.c | 21 ++++++++++++--------- source3/modules/vfs_gpfs.c | 10 +++++----- 3 files changed, 19 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index aad34cb..a618e21 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -858,7 +858,7 @@ bool user_sid_in_group_sid(const struct dom_sid *sid, const struct dom_sid *grou gid_t gid; char *found_username; struct security_token *token; - bool result; + bool result = false; enum lsa_SidType type; TALLOC_CTX *mem_ctx = talloc_stackframe(); @@ -880,8 +880,7 @@ bool user_sid_in_group_sid(const struct dom_sid *sid, const struct dom_sid *grou if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("could not create token for %s\n", dom_sid_string(mem_ctx, sid))); - TALLOC_FREE(mem_ctx); - return False; + goto done; } result = security_token_has_sid(token, group_sid); diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c index d8e64b3..611d07a 100644 --- a/source3/libsmb/pylibsmb.c +++ b/source3/libsmb/pylibsmb.c @@ -166,7 +166,7 @@ static int py_cli_thread_destructor(struct py_cli_thread *t) static bool py_cli_state_setup_ev(struct py_cli_state *self) { - struct py_cli_thread *t; + struct py_cli_thread *t = NULL; int ret; self->ev = tevent_context_init_byname(NULL, "poll_mt"); @@ -202,15 +202,18 @@ static bool py_cli_state_setup_ev(struct py_cli_state *self) return true; fail: - TALLOC_FREE(t->shutdown_fde); + if (t != NULL) { + TALLOC_FREE(t->shutdown_fde); - if (t->shutdown_pipe[0] != -1) { - close(t->shutdown_pipe[0]); - t->shutdown_pipe[0] = -1; - } - if (t->shutdown_pipe[1] != -1) { - close(t->shutdown_pipe[1]); - t->shutdown_pipe[1] = -1; + if (t->shutdown_pipe[0] != -1) { + close(t->shutdown_pipe[0]); + t->shutdown_pipe[0] = -1; + } + if (t->shutdown_pipe[1] != -1) { + close(t->shutdown_pipe[1]); + t->shutdown_pipe[1] = -1; + } + TALLOC_FREE(t); } TALLOC_FREE(self->thread_state); diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index a39187e..8959fe6 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -554,7 +554,7 @@ static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl) SMB_ACL_T result; gpfs_aclCount_t i; - result = sys_acl_init(pacl->acl_nace); + result = sys_acl_init(); if (result == NULL) { errno = ENOMEM; return NULL; @@ -573,14 +573,14 @@ static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl) switch (g_ace->ace_type) { case GPFS_ACL_USER: ace->a_type = SMB_ACL_USER; - ace->uid = (uid_t)g_ace->ace_who; + ace->info.user.uid = (uid_t)g_ace->ace_who; break; case GPFS_ACL_USER_OBJ: ace->a_type = SMB_ACL_USER_OBJ; break; case GPFS_ACL_GROUP: ace->a_type = SMB_ACL_GROUP; - ace->gid = (gid_t)g_ace->ace_who; + ace->info.group.gid = (gid_t)g_ace->ace_who; break; case GPFS_ACL_GROUP_OBJ: ace->a_type = SMB_ACL_GROUP_OBJ; @@ -738,7 +738,7 @@ static struct gpfs_acl *smb2gpfs_acl(const SMB_ACL_T pacl, switch(ace->a_type) { case SMB_ACL_USER: g_ace->ace_type = GPFS_ACL_USER; - g_ace->ace_who = (gpfs_uid_t)ace->uid; + g_ace->ace_who = (gpfs_uid_t)ace->info.user.uid; break; case SMB_ACL_USER_OBJ: g_ace->ace_type = GPFS_ACL_USER_OBJ; @@ -747,7 +747,7 @@ static struct gpfs_acl *smb2gpfs_acl(const SMB_ACL_T pacl, break; case SMB_ACL_GROUP: g_ace->ace_type = GPFS_ACL_GROUP; - g_ace->ace_who = (gpfs_uid_t)ace->gid; + g_ace->ace_who = (gpfs_uid_t)ace->info.group.gid; break; case SMB_ACL_GROUP_OBJ: g_ace->ace_type = GPFS_ACL_GROUP_OBJ; -- Samba Shared Repository