The branch, master has been updated
via 8eef4ab s3-lib: Fix %G substitution for domain users in smbd
via 7393781 s3:winbindd fix use of uninitialized variables
via a24c25b s3:lib/asys modify included headers
from f98d10a smbd: Always use UCF_PREP_CREATEFILE for filename_convert
calls to resolve a path for open.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8eef4ab79ec5fb7e96ad2f2ad6c9bf30db13a50d
Author: Andreas Schneider <[email protected]>
Date: Wed Nov 27 17:21:01 2013 +0100
s3-lib: Fix %G substitution for domain users in smbd
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10286
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Christian Ambach <[email protected]>
Autobuild-User(master): Christian Ambach <[email protected]>
Autobuild-Date(master): Tue Dec 10 16:39:43 CET 2013 on sn-devel-104
commit 7393781a57891687b464762b0954e6c936f750bb
Author: Christian Ambach <[email protected]>
Date: Mon Sep 16 13:18:17 2013 +0200
s3:winbindd fix use of uninitialized variables
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10280
Signed-off-by: Christian Ambach <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit a24c25bddeafefe7de713dbbd26ac3ee6d50a61f
Author: Christian Ambach <[email protected]>
Date: Fri Nov 22 05:12:05 2013 +0100
s3:lib/asys modify included headers
use the headers from libreplace, not the system ones
Signed-off-by: Christian Ambach <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/asys/asys.h | 6 ++----
source3/lib/substitute.c | 12 +++++++++++-
source3/winbindd/winbindd_cache.c | 13 +++++++++++++
3 files changed, 26 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/asys/asys.h b/source3/lib/asys/asys.h
index 73f1051..10805bd 100644
--- a/source3/lib/asys/asys.h
+++ b/source3/lib/asys/asys.h
@@ -19,10 +19,8 @@
#ifndef __ASYS_H__
#define __ASYS_H__
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include "replace.h"
+#include "system/filesys.h"
/**
* @defgroup asys The async syscall library
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index ca2ac79..937f02c 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -499,10 +499,20 @@ char *talloc_sub_basic(TALLOC_CTX *mem_ctx,
break;
case 'G' : {
struct passwd *pass;
- r = talloc_strdup(tmp_ctx, smb_name);
+
+ if (domain_name != NULL && domain_name[0] != '\0') {
+ r = talloc_asprintf(tmp_ctx,
+ "%s%c%s",
+ domain_name,
+ *lp_winbind_separator(),
+ smb_name);
+ } else {
+ r = talloc_strdup(tmp_ctx, smb_name);
+ }
if (r == NULL) {
goto error;
}
+
pass = Get_Pwnam_alloc(tmp_ctx, r);
if (pass != NULL) {
a_string = realloc_string_sub(
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index 276ec8e..b9cfd82 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2126,6 +2126,19 @@ static NTSTATUS rids_to_names(struct winbindd_domain
*domain,
old_status) {
have_mapped = have_unmapped = false;
+ *names = talloc_array(mem_ctx, char *, num_rids);
+ if (*names != NULL) {
+ result = NT_STATUS_NO_MEMORY;
+ goto error;
+ }
+
+ *types = talloc_array(mem_ctx, enum lsa_SidType,
+ num_rids);
+ if (*types != NULL) {
+ result = NT_STATUS_NO_MEMORY;
+ goto error;
+ }
+
for (i=0; i<num_rids; i++) {
struct dom_sid sid;
struct cache_entry *centry;
--
Samba Shared Repository
