[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4437547 s4-selftest: Try a more complex ACL - this example from a
GPO
via 97a1f8d s4-selftest: Try to make ntacl unit tests better match
their names
via 6c9d22d file_server: Clarify code by avoiding a goto
via 30253c1 s4-samba-tool: Ensure we also sync the SACL as well as the
DACL during sysvolreset
from 9983ad7 s3-passdb: Rename pdb_samba4 to samba_dsdb and
autoconfigure when we are a AD DC
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4437547afab2def2b53f2be1b10ac7b376f5ee8f
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 17:56:38 2012 +1000
s4-selftest: Try a more complex ACL - this example from a GPO
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Sep 4 11:30:17 CEST 2012 on sn-devel-104
commit 97a1f8d20be2068e3214361f844a6282e10ab28d
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 17:54:34 2012 +1000
s4-selftest: Try to make ntacl unit tests better match their names
We are trying to test combinations of setting and getting via the VFS
and directly to the underlying DB.
Andrew Bartlett
commit 6c9d22d1ed5cc886b7a7c886f7298fea8c60089c
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 17:18:45 2012 +1000
file_server: Clarify code by avoiding a goto
As suggested by Ricky Nance ricky.na...@weaubleau.k12.mo.us
Andrew Bartlett
commit 30253c11cca5be8b5eaddeb12f1a749315928679
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 17:17:34 2012 +1000
s4-samba-tool: Ensure we also sync the SACL as well as the DACL during
sysvolreset
---
Summary of changes:
file_server/file_server.c|6 +---
source4/scripting/python/samba/ntacls.py |2 +-
source4/scripting/python/samba/tests/posixacl.py | 24 +
3 files changed, 22 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/file_server/file_server.c b/file_server/file_server.c
index a3efcb2..e1560c2 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -117,15 +117,13 @@ static void s3fs_task_init(struct task_server *task)
NULL);
if (req == NULL) {
DEBUG(0, (Failed to start smbd as child daemon\n));
- goto failed;
+ task_server_terminate(task, Failed to startup s3fs smb task,
true);
+ return;
}
tevent_req_set_callback(req, file_server_smbd_done, task);
DEBUG(1,(Started file server smbd with config %s\n, fileserver_conf));
- return;
-failed:
- task_server_terminate(task, Failed to startup s3fs smb task, true);
}
/* called at smbd startup - register ourselves as a server service */
diff --git a/source4/scripting/python/samba/ntacls.py
b/source4/scripting/python/samba/ntacls.py
index ac4aad0..38c31c6 100644
--- a/source4/scripting/python/samba/ntacls.py
+++ b/source4/scripting/python/samba/ntacls.py
@@ -105,7 +105,7 @@ def setntacl(lp, file, sddl, domsid, backend=None,
eadbfile=None, use_ntvfs=True
samba.xattr_native.wrap_setxattr(file, xattr.XATTR_NTACL_NAME,
ndr_pack(ntacl))
else:
-smbd.set_nt_acl(file, security.SECINFO_OWNER | security.SECINFO_GROUP
| security.SECINFO_DACL, sd)
+smbd.set_nt_acl(file, security.SECINFO_OWNER | security.SECINFO_GROUP
| security.SECINFO_DACL | security.SECINFO_SACL, sd)
def ldapmask2filemask(ldm):
diff --git a/source4/scripting/python/samba/tests/posixacl.py
b/source4/scripting/python/samba/tests/posixacl.py
index 64c997d..ba0911d 100644
--- a/source4/scripting/python/samba/tests/posixacl.py
+++ b/source4/scripting/python/samba/tests/posixacl.py
@@ -59,7 +59,7 @@ class PosixAclMappingTests(TestCase):
tempf = os.path.join(path,pytests+str(int(10*random.random(
open(tempf, 'w').write(empty)
setntacl(lp,tempf,acl,S-1-5-21-2212615479-2695158682-2101375467,
use_ntvfs=True)
-facl = getntacl(lp,tempf)
+facl = getntacl(lp,tempf, direct_db_access=True)
anysid = security.dom_sid(security.SID_NT_SELF)
self.assertEquals(facl.as_sddl(anysid),acl)
os.unlink(tempf)
@@ -72,8 +72,8 @@ class PosixAclMappingTests(TestCase):
acl =
O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)
tempf = os.path.join(path,pytests+str(int(10*random.random(
open(tempf, 'w').write(empty)
-setntacl(lp,tempf,acl,S-1-5-21-2212615479-2695158682-2101375467,
use_ntvfs=False)
-facl =
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4def1c1 file_server: Remove explicit set of passdb backend in
fileserver.conf
via 7afd476 build: sync the waf ACL checks with configure.in
via a566404 build: Remove references to charset modules - we no longer
have these
via cac1ebf build: vfs_fake_acls does not need the acl lib
via 73932a3 file_server: Run task_server_terminate when smbd exists
via 8d3e193 file_server: use 'subreq' as variable instead of 'req'
via 2c9c589 build: remove unused HAVE_NO_ACLS define
from 4437547 s4-selftest: Try a more complex ACL - this example from a
GPO
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4def1c1780c98d6595b778a6647818b79dea797a
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 20:31:03 2012 +1000
file_server: Remove explicit set of passdb backend in fileserver.conf
The default is now set during smb.conf loading based on the server role
or during provision.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Sep 4 14:05:34 CEST 2012 on sn-devel-104
commit 7afd476fe412a3cacad4671673f8cb05592bbb94
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 20:15:28 2012 +1000
build: sync the waf ACL checks with configure.in
This should give us full ACLs on the same set of hosts that the autoconf
build supports.
Andrew Bartlett
commit a566404362cc7e45b5ce619db81175b55c55c288
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 20:06:12 2012 +1000
build: Remove references to charset modules - we no longer have these
commit cac1ebfff6c83bfe6cec3a740dface97f706f9ff
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 19:41:38 2012 +1000
build: vfs_fake_acls does not need the acl lib
commit 73932a3aa40bb4b2c2bd22f1be3abc546ab83481
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 11:06:15 2012 +0200
file_server: Run task_server_terminate when smbd exists
This will help us shut down when smbd cannot bind to ports or perform
some other critical startup operation.
Based on a patch by Stefan Metzmacher me...@samba.org
Andrew Bartlett
commit 8d3e193fa153eb0c219953707db5ac4cb93cc853
Author: Stefan Metzmacher me...@samba.org
Date: Tue Sep 4 11:04:16 2012 +0200
file_server: use 'subreq' as variable instead of 'req'
This matches the style of all other tevent_req users.
metze
commit 2c9c58993cf36bc959d3bf1ca634fbaf9bb3a08f
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 18:58:53 2012 +1000
build: remove unused HAVE_NO_ACLS define
---
Summary of changes:
file_server/file_server.c | 13 ++
source3/configure.in |3 --
source3/modules/wscript_build |3 +-
source3/wscript | 52 +++-
4 files changed, 45 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/file_server/file_server.c b/file_server/file_server.c
index e1560c2..0777de5 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -51,7 +51,6 @@ static const char *generate_smb_conf(struct task_server *task)
fdprintf(fd, [globals]\n);
fdprintf(fd, # auto-generated config for fileserver\n);
fdprintf(fd, server role check:inhibit=yes\n);
- fdprintf(fd, passdb backend = samba4\n);
fdprintf(fd, rpc_server:default = external\n);
fdprintf(fd, rpc_server:svcctl = embedded\n);
fdprintf(fd, rpc_server:srvsvc = embedded\n);
@@ -78,6 +77,9 @@ static const char *generate_smb_conf(struct task_server *task)
*/
static void file_server_smbd_done(struct tevent_req *subreq)
{
+ struct task_server *task =
+ tevent_req_callback_data(subreq,
+ struct task_server);
int sys_errno;
int ret;
@@ -87,6 +89,7 @@ static void file_server_smbd_done(struct tevent_req *subreq)
} else {
DEBUG(0,(file_server smbd daemon exited normally\n));
}
+ task_server_terminate(task, smbd child process exited, true);
}
@@ -96,7 +99,7 @@ static void file_server_smbd_done(struct tevent_req *subreq)
static void s3fs_task_init(struct task_server *task)
{
const char *fileserver_conf;
- struct tevent_req *req;
+ struct tevent_req *subreq;
const char *smbd_path;
const char *smbd_cmd[2] = { NULL, NULL };
@@ -109,19 +112,19 @@ static void s3fs_task_init(struct task_server *task)
smbd_cmd[0] = smbd_path;
/* start it as a child process */
- req = samba_runcmd_send(task, task-event_ctx, timeval_zero(), 1, 0,
+ subreq = samba_runcmd_send(task, task-event_ctx, timeval_zero(), 1, 0,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3390d99 s3-winbind: DON'T PANIC if we couldn't find the domain.
from 4def1c1 file_server: Remove explicit set of passdb backend in
fileserver.conf
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3390d9902a4e0b74e3437594f9f20d621b18305b
Author: Andreas Schneider a...@samba.org
Date: Tue Sep 4 14:30:38 2012 +0200
s3-winbind: DON'T PANIC if we couldn't find the domain.
If we don't have a connection to a trusted domain but still try to do a
lookup we shouldn't segfault.
Autobuild-User(master): Andreas Schneider a...@cryptomilk.org
Autobuild-Date(master): Tue Sep 4 18:16:06 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/winbindd/winbindd_group.c | 10 +-
1 files changed, 9 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_group.c
b/source3/winbindd/winbindd_group.c
index 2f8ba6a..ae461bf 100644
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -35,9 +35,17 @@ bool fill_grent(TALLOC_CTX *mem_ctx, struct winbindd_gr *gr,
{
fstring full_group_name;
char *mapped_name = NULL;
- struct winbindd_domain *domain = find_domain_from_name_noinit(dom_name);
+ struct winbindd_domain *domain;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
+ domain = find_domain_from_name_noinit(dom_name);
+ if (domain == NULL) {
+ DEBUG(0, (Failed to find domain '%s'.
+ Check connection to trusted domains!\n,
+ dom_name));
+ return false;
+ }
+
nt_status = normalize_name_map(mem_ctx, domain, gr_name,
mapped_name);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 7ec71c2 s3-winbind: DON'T PANIC if we couldn't find the domain.
from 1bb5d20 Fix bug #9124 - Samba fails to set inherited bit on
inherited ACE's.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 7ec71c28e9153164d222966a375f1804c8c7
Author: Andreas Schneider a...@samba.org
Date: Tue Sep 4 14:30:38 2012 +0200
s3-winbind: DON'T PANIC if we couldn't find the domain.
If we don't have a connection to a trusted domain but still try to do a
lookup we shouldn't segfault.
Signed-off-by: Andreas Schneider a...@samba.org
Fix bug #9135 - Don't segfault if we don't find a domain in
resolve_username_to_alias()/fill_grent() .
---
Summary of changes:
source3/winbindd/winbindd_group.c | 10 +-
1 files changed, 9 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_group.c
b/source3/winbindd/winbindd_group.c
index 9cc1d14..8662a9c 100644
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -35,9 +35,17 @@ bool fill_grent(TALLOC_CTX *mem_ctx, struct winbindd_gr *gr,
{
fstring full_group_name;
char *mapped_name = NULL;
- struct winbindd_domain *domain = find_domain_from_name_noinit(dom_name);
+ struct winbindd_domain *domain;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
+ domain = find_domain_from_name_noinit(dom_name);
+ if (domain == NULL) {
+ DEBUG(0, (Failed to find domain '%s'.
+ Check connection to trusted domains!\n,
+ dom_name));
+ return false;
+ }
+
nt_status = normalize_name_map(mem_ctx, domain, gr_name,
mapped_name);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2172a14 s3: in sys_popen(), add a debug message for failed fork
via c1b703f s3: in sys_popen(), add a debug message for failed
extract_args()
via 6c7df39 s3: in sys_popen(), untangle function call from result check
via 1d4fe78 s3: in sys_popen(), untangle assigment from check and add a
debug message in failure case
via d43c411 s3: in sys_popen(), improve call to pipe and report error
to debug
via 243157a s3: in sys_popen(), validate input before opening the pipe.
via e7d385c s3: in sys_popen(), fix a debug message
via b1966f3 s3:smbd: in sys_disk_free(), improve a debug message
via cc99189 s3:smbd: in sys_disk_free(), improve a debug message
via 04ac781 s3:smbd: in sys_disk_free(), fix line length and
indentation of debug statement
via a56d2de s3:smbd: in sys_disk_free(), fix a debug message
from 3390d99 s3-winbind: DON'T PANIC if we couldn't find the domain.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2172a1448e8798b4df50d5874b38a252d15b3ad0
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 15:25:42 2012 +0200
s3: in sys_popen(), add a debug message for failed fork
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Tue Sep 4 22:17:30 CEST 2012 on sn-devel-104
commit c1b703f95cb35798c4948aa01b9cb75184c29522
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 15:24:46 2012 +0200
s3: in sys_popen(), add a debug message for failed extract_args()
commit 6c7df39feeaeebeca88562e575aa0c803559b0d7
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 15:23:01 2012 +0200
s3: in sys_popen(), untangle function call from result check
commit 1d4fe78db928c5f68aa805d1f5dc6a941fbb10fc
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 15:19:46 2012 +0200
s3: in sys_popen(), untangle assigment from check and add a debug message
in failure case
commit d43c411fb19707f1b57177e9a3300573018cc849
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 15:17:37 2012 +0200
s3: in sys_popen(), improve call to pipe and report error to debug
commit 243157ae345f32b06f9c1a223139891339d0ad82
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 15:15:42 2012 +0200
s3: in sys_popen(), validate input before opening the pipe.
commit e7d385c366f04586c6e1490ea0a8cd4b1225f552
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 14:21:37 2012 +0200
s3: in sys_popen(), fix a debug message
commit b1966f31188abcadabb48090cccfccaae150445e
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 15:02:40 2012 +0200
s3:smbd: in sys_disk_free(), improve a debug message
commit cc99189de1330074d10012578a1729d7be1e41f5
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 15:01:18 2012 +0200
s3:smbd: in sys_disk_free(), improve a debug message
commit 04ac7816262dcb69dd88fe0409c5bd03ab894f56
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 14:50:53 2012 +0200
s3:smbd: in sys_disk_free(), fix line length and indentation of debug
statement
commit a56d2dea06aa089330c8d7df32c124abf1fab851
Author: Michael Adam ob...@samba.org
Date: Tue Sep 4 14:50:15 2012 +0200
s3:smbd: in sys_disk_free(), fix a debug message
---
Summary of changes:
source3/lib/system.c | 27 +++
source3/smbd/dfree.c |7 ---
2 files changed, 23 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 2881fd6..d69f1c6 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1161,32 +1161,43 @@ int sys_popen(const char *command)
char **argl = NULL;
int ret;
- if (pipe(pipe_fds) 0)
+ if (!*command) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ ret = pipe(pipe_fds);
+ if (ret 0) {
+ DEBUG(0, (sys_popen: error opening pipe: %s\n,
+ strerror(errno)));
return -1;
+ }
parent_end = pipe_fds[0];
child_end = pipe_fds[1];
- if (!*command) {
- errno = EINVAL;
+ entry = SMB_MALLOC_P(popen_list);
+ if (entry == NULL) {
+ DEBUG(0, (sys_popen: malloc failed\n));
goto err_exit;
}
- if((entry = SMB_MALLOC_P(popen_list)) == NULL)
- goto err_exit;
-
ZERO_STRUCTP(entry);
/*
* Extract the command and args into a NULL terminated array.
*/
- if(!(argl = extract_args(NULL, command)))
+ argl = extract_args(NULL, command);
+ if (argl == NULL) {
+ DEBUG(0, (sys_popen: extract_args() failed: %s\n,
strerror(errno)));
goto err_exit;
+ }
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 084978f s3: Slightly simplify fd_open_atomic
via d95d326 s3: Put a comment into the right place
via d0df12f s3: Fix a typo
via 63279e3 s3: Factor out disposition_to_open_flags
via f67a6c4 s3: Factor out calculation of clear_ads
via 0d86932 s3: Slightly simplify open_file_ntcreate
via 25bdc36 s3: Fix a comment
via 93e10db s3: Make open_match_attributes static
via 1c9b1e0 s3: Fix some nonempty blank lines
via 2fe08c8 s3: Fix memleaks in pylibsmb.c
from 2172a14 s3: in sys_popen(), add a debug message for failed fork
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 084978f3d0306b7800c3ce64bf99ba30e6ac2fb1
Author: Volker Lendecke v...@samba.org
Date: Mon Sep 3 12:57:18 2012 +0200
s3: Slightly simplify fd_open_atomic
Replace an if-statement by a direct assignment
Signed-off-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Wed Sep 5 01:56:46 CEST 2012 on sn-devel-104
commit d95d32606b5f90e865c3c8eef95f14be938b3bbe
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 2 12:42:59 2012 +0200
s3: Put a comment into the right place
Signed-off-by: Jeremy Allison j...@samba.org
commit d0df12f3ea6d3ad9bc83d9628ab68da9b4cc44d4
Author: Volker Lendecke v...@samba.org
Date: Wed Aug 29 17:19:04 2012 +0200
s3: Fix a typo
Signed-off-by: Jeremy Allison j...@samba.org
commit 63279e374a26e4b855b5089b8d616f199609d8fe
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 2 20:47:46 2012 +0200
s3: Factor out disposition_to_open_flags
Signed-off-by: Jeremy Allison j...@samba.org
commit f67a6c463cbe14dfaaeb8a6255cfb587eea1b5a2
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 2 13:06:22 2012 +0200
s3: Factor out calculation of clear_ads
Signed-off-by: Jeremy Allison j...@samba.org
commit 0d869327edaede4f573cd607a14538d92160a286
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 2 12:53:04 2012 +0200
s3: Slightly simplify open_file_ntcreate
We have not set flags2 before, so do direct assignment and not |=
Signed-off-by: Jeremy Allison j...@samba.org
commit 25bdc3641890cc0fc5f4587e011c968d4b4f6a6b
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 2 07:35:43 2012 +0200
s3: Fix a comment
Signed-off-by: Jeremy Allison j...@samba.org
commit 93e10db3dde3616ab61bf28e0b9c44378d445ab5
Author: Volker Lendecke v...@samba.org
Date: Fri Aug 31 14:52:21 2012 +0200
s3: Make open_match_attributes static
Signed-off-by: Jeremy Allison j...@samba.org
commit 1c9b1e07662dca308c8432890d3d5055639b675a
Author: Volker Lendecke v...@samba.org
Date: Fri Aug 31 14:41:44 2012 +0200
s3: Fix some nonempty blank lines
Signed-off-by: Jeremy Allison j...@samba.org
commit 2fe08c886ae60c0affae0166ce1cdab1593bab3e
Author: Volker Lendecke v...@samba.org
Date: Mon Aug 20 13:43:41 2012 +0200
s3: Fix memleaks in pylibsmb.c
CutPaste errors from the readx routine
Signed-off-by: Jeremy Allison j...@samba.org
---
Summary of changes:
source3/lib/dbwrap/dbwrap_watch.h |2 +-
source3/libsmb/pylibsmb.c |4 +-
source3/locking/share_mode_lock.c |2 +-
source3/passdb/lookup_sid.c |6 +-
source3/smbd/open.c | 139 -
source3/smbd/proto.h |6 --
6 files changed, 99 insertions(+), 60 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/dbwrap/dbwrap_watch.h
b/source3/lib/dbwrap/dbwrap_watch.h
index 66fef32..3362e45 100644
--- a/source3/lib/dbwrap/dbwrap_watch.h
+++ b/source3/lib/dbwrap/dbwrap_watch.h
@@ -43,4 +43,4 @@ void dbwrap_watchers_traverse_read(
void dbwrap_watchers_wakeall(struct messaging_context *msg);
-#endif /* __DBWRAP_H__ */
+#endif /* __DBWRAP_WATCH_H__ */
diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index be04e5b..d8e64b3 100644
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -577,9 +577,9 @@ static PyObject *py_cli_ftruncate(struct py_cli_state
*self, PyObject *args,
return NULL;
}
status = cli_ftruncate_recv(req);
+ TALLOC_FREE(req);
if (!NT_STATUS_IS_OK(status)) {
- TALLOC_FREE(req);
PyErr_SetNTSTATUS(status);
return NULL;
}
@@ -609,9 +609,9 @@ static PyObject *py_cli_delete_on_close(struct py_cli_state
*self,
return NULL;
}
status = cli_nt_delete_on_close_recv(req);
+ TALLOC_FREE(req);
if (!NT_STATUS_IS_OK(status)) {
- TALLOC_FREE(req);
PyErr_SetNTSTATUS(status);
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 15e3991 build: Remove unused deps from vfs modules
from 084978f s3: Slightly simplify fd_open_atomic
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 15e3991b39d2e9496d01d18479db2804804a39f6
Author: Andrew Bartlett abart...@samba.org
Date: Wed Sep 5 08:55:41 2012 +1000
build: Remove unused deps from vfs modules
Both these modules are just implemented in terms of other modules.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Wed Sep 5 03:34:08 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/modules/wscript_build |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index dee7ea3..594b27c 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -99,7 +99,7 @@ bld.SAMBA3_MODULE('vfs_full_audit',
bld.SAMBA3_MODULE('vfs_fake_perms',
subsystem='vfs',
source=VFS_FAKE_PERMS_SRC,
- deps='acl attr samba-util',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_perms'))
@@ -107,7 +107,7 @@ bld.SAMBA3_MODULE('vfs_fake_perms',
bld.SAMBA3_MODULE('vfs_fake_acls',
subsystem='vfs',
source=VFS_FAKE_ACLS_SRC,
- deps='attr samba-util',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_acls'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_acls'))
--
Samba Shared Repository
