The branch, v3-6-test has been updated
via 665df24 selftest/Samba3: use 'debug pid=yes'
via be4a2d8 s3:smbd: remove uses of "./" in unlink_internals()
from 0268296 s3: use getgrset() when it is available
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 665df24088002cc67c9a4523e73f75a05e80665c
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Mar 18 10:03:05 2011 +0100
selftest/Samba3: use 'debug pid=yes'
metze
Autobuild-User: Stefan Metzmacher <me...@samba.org>
Autobuild-Date: Sat Mar 19 10:55:34 CET 2011 on sn-devel-104
(cherry picked from commit ce45027816d27e4493739b2f45821febb462ba02)
commit be4a2d80a016688d85d72d74a6f2bb71872bb8fd
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Mar 18 16:01:26 2011 +0100
s3:smbd: remove uses of "./" in unlink_internals()
Commit 78b931ce6c840ade646c1c6030fa2d6acb77208b tried to do that,
but didn't have any effect.
metze
(cherry picked from commit daddccb5149fb0e7da120a163cd6739d0397ff86)
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba3.pm | 1 +
source3/smbd/reply.c | 4 ----
2 files changed, 1 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index adba749..1ed76b1 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -532,6 +532,7 @@ sub provision($$$$$$)
lock directory = $lockdir
log file = $logdir/log.\%m
log level = 0
+ debug pid = yes
name resolve order = bcast
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 561281f..26a73b8 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2599,10 +2599,6 @@ NTSTATUS unlink_internals(connection_struct *conn,
struct smb_request *req,
fname_dir,
fname_mask);
}
- smb_fname->base_name = talloc_asprintf(smb_fname,
- "%s/%s",
- fname_dir,
- fname_mask);
if (!smb_fname->base_name) {
status = NT_STATUS_NO_MEMORY;
goto out;
--
Samba Shared Repository
