[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Thu Mar 26 18:25:06 MDT 2015
The branch, master has been updated
via f0e9ba9 Rename SMB2_OP_FIND to SMB2_OP_QUERY_DIRECTORY so that it conforms with the MS document MS-SMB2.
via 70d20da Move update-external.sh to third_party/
via 483bb68 Merge update-waf.sh into update-external.sh
via 90ec37c Move waf into third_party/.
from 32cbbed s3: libsmbclient: Add missing talloc stackframe.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f0e9ba91c0610b038cb2c3d7a487e0d904855dc5
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Tue Mar 24 07:16:26 2015 -0700
Rename SMB2_OP_FIND to SMB2_OP_QUERY_DIRECTORY so that it conforms with the MS document MS-SMB2.
Signed-off-by: Richard Sharpe <rsharpe at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri Mar 27 01:24:47 CET 2015 on sn-devel-104
commit 70d20da561088a04bf8d87f31771228a8ffccea8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Mar 25 11:13:42 2015 +0000
Move update-external.sh to third_party/
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 483bb682a87b10b1faebb2eda40ed3bed2d7a0df
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Mar 25 11:13:41 2015 +0000
Merge update-waf.sh into update-external.sh
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 90ec37cf90035576bcab4d7b36214c9c19a52d24
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Mar 25 11:13:40 2015 +0000
Move waf into third_party/.
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/bin/waf | 2 +-
buildtools/update-waf.sh | 13 --------
ctdb/wscript | 2 +-
lib/ldb/wscript | 2 +-
lib/replace/wscript | 2 +-
lib/talloc/wscript | 3 +-
lib/tdb/wscript | 2 +-
lib/tevent/wscript | 2 +-
libcli/smb/smb2_constants.h | 38 +++++++++++-----------
libcli/smb/smb2cli_query_directory.c | 2 +-
selftest/tests.py | 2 +-
source3/smbd/globals.h | 2 +-
.../smbd/{smb2_find.c => smb2_query_directory.c} | 30 ++++++++---------
source3/smbd/smb2_server.c | 6 ++--
source3/wscript_build | 2 +-
source4/libcli/smb2/find.c | 2 +-
source4/smb_server/smb2/receive.c | 2 +-
lib/update-external.sh => third_party/update.sh | 9 +++--
.../waf}/wafadmin/3rdparty/ParallelDebug.py | 2 --
.../waf}/wafadmin/3rdparty/batched_cc.py | 1 -
.../waf}/wafadmin/3rdparty/boost.py | 1 -
.../waf}/wafadmin/3rdparty/build_file_tracker.py | 1 -
.../waf}/wafadmin/3rdparty/fluid.py | 1 -
.../waf}/wafadmin/3rdparty/gccdeps.py | 1 -
.../waf}/wafadmin/3rdparty/go.py | 1 -
.../waf}/wafadmin/3rdparty/lru_cache.py | 1 -
.../waf}/wafadmin/3rdparty/paranoid.py | 1 -
.../waf}/wafadmin/3rdparty/prefork.py | 1 -
.../waf}/wafadmin/3rdparty/swig.py | 1 -
.../waf}/wafadmin/3rdparty/valadoc.py | 1 -
{buildtools => third_party/waf}/wafadmin/Build.py | 1 -
.../waf}/wafadmin/Configure.py | 2 --
.../waf}/wafadmin/Constants.py | 1 -
.../waf}/wafadmin/Environment.py | 1 -
{buildtools => third_party/waf}/wafadmin/Logs.py | 1 -
{buildtools => third_party/waf}/wafadmin/Node.py | 1 -
.../waf}/wafadmin/Options.py | 1 -
{buildtools => third_party/waf}/wafadmin/Runner.py | 1 -
.../waf}/wafadmin/Scripting.py | 1 -
{buildtools => third_party/waf}/wafadmin/Task.py | 1 -
.../waf}/wafadmin/TaskGen.py | 5 ++-
.../waf}/wafadmin/Tools/__init__.py | 1 -
.../waf}/wafadmin/Tools/ar.py | 2 --
.../waf}/wafadmin/Tools/bison.py | 1 -
.../waf}/wafadmin/Tools/cc.py | 1 -
.../waf}/wafadmin/Tools/ccroot.py | 1 -
.../waf}/wafadmin/Tools/compiler_cc.py | 1 -
.../waf}/wafadmin/Tools/compiler_cxx.py | 1 -
.../waf}/wafadmin/Tools/compiler_d.py | 1 -
.../waf}/wafadmin/Tools/config_c.py | 1 -
.../waf}/wafadmin/Tools/cs.py | 1 -
.../waf}/wafadmin/Tools/cxx.py | 1 -
.../waf}/wafadmin/Tools/d.py | 1 -
.../waf}/wafadmin/Tools/dbus.py | 1 -
.../waf}/wafadmin/Tools/dmd.py | 1 -
.../waf}/wafadmin/Tools/flex.py | 1 -
.../waf}/wafadmin/Tools/gas.py | 1 -
.../waf}/wafadmin/Tools/gcc.py | 1 -
.../waf}/wafadmin/Tools/gdc.py | 1 -
.../waf}/wafadmin/Tools/glib2.py | 1 -
.../waf}/wafadmin/Tools/gnome.py | 1 -
.../waf}/wafadmin/Tools/gnu_dirs.py | 1 -
.../waf}/wafadmin/Tools/gob2.py | 1 -
.../waf}/wafadmin/Tools/gxx.py | 3 +-
.../waf}/wafadmin/Tools/icc.py | 0
.../waf}/wafadmin/Tools/icpc.py | 0
.../waf}/wafadmin/Tools/intltool.py | 1 -
.../waf}/wafadmin/Tools/javaw.py | 1 -
.../waf}/wafadmin/Tools/kde4.py | 1 -
.../waf}/wafadmin/Tools/libtool.py | 1 -
.../waf}/wafadmin/Tools/lua.py | 1 -
.../waf}/wafadmin/Tools/misc.py | 1 -
.../waf}/wafadmin/Tools/msvc.py | 7 ++--
.../waf}/wafadmin/Tools/nasm.py | 3 +-
.../waf}/wafadmin/Tools/ocaml.py | 1 -
.../waf}/wafadmin/Tools/osx.py | 1 -
.../waf}/wafadmin/Tools/perl.py | 1 -
.../waf}/wafadmin/Tools/preproc.py | 2 --
.../waf}/wafadmin/Tools/python.py | 1 -
.../waf}/wafadmin/Tools/qt4.py | 1 -
.../waf}/wafadmin/Tools/ruby.py | 1 -
.../waf}/wafadmin/Tools/suncc.py | 0
.../waf}/wafadmin/Tools/suncxx.py | 0
.../waf}/wafadmin/Tools/tex.py | 1 -
.../waf}/wafadmin/Tools/unittestw.py | 2 --
.../waf}/wafadmin/Tools/vala.py | 1 -
.../waf}/wafadmin/Tools/winres.py | 1 -
.../waf}/wafadmin/Tools/xlc.py | 0
.../waf}/wafadmin/Tools/xlcxx.py | 0
{buildtools => third_party/waf}/wafadmin/Utils.py | 1 -
.../waf}/wafadmin/__init__.py | 0
.../waf}/wafadmin/ansiterm.py | 1 -
{buildtools => third_party/waf}/wafadmin/pproc.py | 1 -
.../waf}/wafadmin/py3kfixes.py | 1 -
94 files changed, 65 insertions(+), 146 deletions(-)
delete mode 100755 buildtools/update-waf.sh
rename source3/smbd/{smb2_find.c => smb2_query_directory.c} (93%)
rename lib/update-external.sh => third_party/update.sh (83%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/ParallelDebug.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/batched_cc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/boost.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/build_file_tracker.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/fluid.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/gccdeps.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/go.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/lru_cache.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/paranoid.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/prefork.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/swig.py (99%)
rename {buildtools => third_party/waf}/wafadmin/3rdparty/valadoc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Build.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Configure.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Constants.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Environment.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Logs.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Node.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Options.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Runner.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Scripting.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Task.py (99%)
rename {buildtools => third_party/waf}/wafadmin/TaskGen.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/__init__.py (98%)
rename {buildtools => third_party/waf}/wafadmin/Tools/ar.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/bison.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/cc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/ccroot.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/compiler_cc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/compiler_cxx.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/compiler_d.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/config_c.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/cs.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/cxx.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/d.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/dbus.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/dmd.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/flex.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/gas.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/gcc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/gdc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/glib2.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/gnome.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/gnu_dirs.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/gob2.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/gxx.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/icc.py (100%)
rename {buildtools => third_party/waf}/wafadmin/Tools/icpc.py (100%)
rename {buildtools => third_party/waf}/wafadmin/Tools/intltool.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/javaw.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/kde4.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/libtool.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/lua.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/misc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/msvc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/nasm.py (95%)
rename {buildtools => third_party/waf}/wafadmin/Tools/ocaml.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/osx.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/perl.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/preproc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/python.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/qt4.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/ruby.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/suncc.py (100%)
rename {buildtools => third_party/waf}/wafadmin/Tools/suncxx.py (100%)
rename {buildtools => third_party/waf}/wafadmin/Tools/tex.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/unittestw.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/vala.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/winres.py (99%)
rename {buildtools => third_party/waf}/wafadmin/Tools/xlc.py (100%)
rename {buildtools => third_party/waf}/wafadmin/Tools/xlcxx.py (100%)
rename {buildtools => third_party/waf}/wafadmin/Utils.py (99%)
rename {buildtools => third_party/waf}/wafadmin/__init__.py (100%)
rename {buildtools => third_party/waf}/wafadmin/ansiterm.py (99%)
rename {buildtools => third_party/waf}/wafadmin/pproc.py (99%)
rename {buildtools => third_party/waf}/wafadmin/py3kfixes.py (99%)
Changeset truncated at 500 lines:
diff --git a/buildtools/bin/waf b/buildtools/bin/waf
index db6a7d3..1b0f466 100755
--- a/buildtools/bin/waf
+++ b/buildtools/bin/waf
@@ -63,7 +63,7 @@ def test(dir):
except OSError: pass
def find_lib():
- return os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+ return os.path.abspath(os.path.join(os.path.dirname(__file__), '../../third_party/waf'))
wafdir = find_lib()
w = join(wafdir, 'wafadmin')
diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh
deleted file mode 100755
index 277111f..0000000
--- a/buildtools/update-waf.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Update our copy of waf
-
-TARGETDIR="`dirname $0`"
-WORKDIR="`mktemp -d -t update-waf-XXXXXX`"
-
-mkdir -p "$WORKDIR"
-
-git clone https://code.google.com/p/waf.waf15/ "$WORKDIR"
-
-rsync -C -avz --delete "$WORKDIR/wafadmin/" "$TARGETDIR/wafadmin/"
-
-rm -rf "$WORKDIR"
diff --git a/ctdb/wscript b/ctdb/wscript
index f0b68cd..cd02262 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -34,7 +34,7 @@ samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc
third_party/popt:third_party/popt
lib/util:lib/util lib/tdb_wrap:lib/tdb_wrap
lib/ccan:lib/ccan libcli/util:libcli/util
- buildtools:buildtools''')
+ buildtools:buildtools third_party/waf:third_party/waf''')
def set_options(opt):
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 886b3e7..65a6843 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -18,7 +18,7 @@ import wafsamba, samba_dist, Options, Utils
samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
third_party/popt:third_party/popt
- buildtools:buildtools''')
+ buildtools:buildtools third_party/waf:third_party/waf''')
def set_options(opt):
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 1949448..8a203c7 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -16,7 +16,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
import wafsamba, samba_dist
import Options
-samba_dist.DIST_DIRS('lib/replace buildtools:buildtools')
+samba_dist.DIST_DIRS('lib/replace buildtools:buildtools third_party/waf:third_party/waf')
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 9efc895..a1b72a0 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -20,7 +20,8 @@ sys.path.insert(0, srcdir+"/buildtools/wafsamba")
import wafsamba, samba_dist, Options
# setup what directories to put in a tarball
-samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
+samba_dist.DIST_DIRS("""lib/talloc:. lib/replace:lib/replace
+buildtools:buildtools third_party/waf:third_party/waf""")
def set_options(opt):
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index b283795..fdc5d2f 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -15,7 +15,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
import wafsamba, samba_dist, Options, Logs
-samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
+samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools third_party/waf:third_party/waf')
tdb1_unit_tests = [
'run-3G-file',
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 0da8232..026cd9a 100755
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -15,7 +15,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
import wafsamba, samba_dist, Options, Logs
-samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools')
+samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools third_party/waf:third_party/waf')
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index 1a6c5ad..baee847 100644
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -67,25 +67,25 @@
#define SMB2_HDR_FLAG_REPLAY_OPERATION 0x20000000
/* SMB2 opcodes */
-#define SMB2_OP_NEGPROT 0x00
-#define SMB2_OP_SESSSETUP 0x01
-#define SMB2_OP_LOGOFF 0x02
-#define SMB2_OP_TCON 0x03
-#define SMB2_OP_TDIS 0x04
-#define SMB2_OP_CREATE 0x05
-#define SMB2_OP_CLOSE 0x06
-#define SMB2_OP_FLUSH 0x07
-#define SMB2_OP_READ 0x08
-#define SMB2_OP_WRITE 0x09
-#define SMB2_OP_LOCK 0x0a
-#define SMB2_OP_IOCTL 0x0b
-#define SMB2_OP_CANCEL 0x0c
-#define SMB2_OP_KEEPALIVE 0x0d
-#define SMB2_OP_FIND 0x0e
-#define SMB2_OP_NOTIFY 0x0f
-#define SMB2_OP_GETINFO 0x10
-#define SMB2_OP_SETINFO 0x11
-#define SMB2_OP_BREAK 0x12
+#define SMB2_OP_NEGPROT 0x00
+#define SMB2_OP_SESSSETUP 0x01
+#define SMB2_OP_LOGOFF 0x02
+#define SMB2_OP_TCON 0x03
+#define SMB2_OP_TDIS 0x04
+#define SMB2_OP_CREATE 0x05
+#define SMB2_OP_CLOSE 0x06
+#define SMB2_OP_FLUSH 0x07
+#define SMB2_OP_READ 0x08
+#define SMB2_OP_WRITE 0x09
+#define SMB2_OP_LOCK 0x0a
+#define SMB2_OP_IOCTL 0x0b
+#define SMB2_OP_CANCEL 0x0c
+#define SMB2_OP_KEEPALIVE 0x0d
+#define SMB2_OP_QUERY_DIRECTORY 0x0e
+#define SMB2_OP_NOTIFY 0x0f
+#define SMB2_OP_GETINFO 0x10
+#define SMB2_OP_SETINFO 0x11
+#define SMB2_OP_BREAK 0x12
#define SMB2_MAGIC 0x424D53FE /* 0xFE 'S' 'M' 'B' */
diff --git a/libcli/smb/smb2cli_query_directory.c b/libcli/smb/smb2cli_query_directory.c
index bccc529..d1ccdb8 100644
--- a/libcli/smb/smb2cli_query_directory.c
+++ b/libcli/smb/smb2cli_query_directory.c
@@ -87,7 +87,7 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
dyn_len = sizeof(state->dyn_pad);
}
- subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_FIND,
+ subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_QUERY_DIRECTORY,
0, 0, /* flags */
timeout_msec,
tcon,
diff --git a/selftest/tests.py b/selftest/tests.py
index cceb6e4..1185142 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -65,7 +65,7 @@ planpythontestsuite("none", "samba.tests.samba3sam")
planpythontestsuite(
"none", "wafsamba.tests.test_suite",
extra_path=[os.path.join(samba4srcdir, "..", "buildtools"),
- os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
+ os.path.join(samba4srcdir, "..", "third_party", "waf", "wafadmin")])
plantestsuite(
"samba4.blackbox.dbcheck.alpha13", "none",
["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"),
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 7726c24..b52c6a9 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -292,7 +292,7 @@ NTSTATUS smb2_write_complete_nosync(struct tevent_req *req, ssize_t nwritten,
NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_ioctl(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req);
-NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req);
+NTSTATUS smbd_smb2_request_process_query_directory(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_notify(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_getinfo(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_setinfo(struct smbd_smb2_request *req);
diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_query_directory.c
similarity index 93%
rename from source3/smbd/smb2_find.c
rename to source3/smbd/smb2_query_directory.c
index 2dab86b..81f2e17 100644
--- a/source3/smbd/smb2_find.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -25,7 +25,7 @@
#include "trans2.h"
#include "../lib/util/tevent_ntstatus.h"
-static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
+static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
struct files_struct *in_fsp,
@@ -34,12 +34,12 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
uint32_t in_file_index,
uint32_t in_output_buffer_length,
const char *in_file_name);
-static NTSTATUS smbd_smb2_find_recv(struct tevent_req *req,
+static NTSTATUS smbd_smb2_query_directory_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
DATA_BLOB *out_output_buffer);
static void smbd_smb2_request_find_done(struct tevent_req *subreq);
-NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req)
+NTSTATUS smbd_smb2_request_process_query_directory(struct smbd_smb2_request *req)
{
NTSTATUS status;
const uint8_t *inbody;
@@ -120,7 +120,7 @@ NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req)
return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
}
- subreq = smbd_smb2_find_send(req, req->sconn->ev_ctx,
+ subreq = smbd_smb2_query_directory_send(req, req->sconn->ev_ctx,
req, in_fsp,
in_file_info_class,
in_flags,
@@ -146,7 +146,7 @@ static void smbd_smb2_request_find_done(struct tevent_req *subreq)
NTSTATUS status;
NTSTATUS error; /* transport error */
- status = smbd_smb2_find_recv(subreq,
+ status = smbd_smb2_query_directory_recv(subreq,
req,
&out_output_buffer);
TALLOC_FREE(subreq);
@@ -192,12 +192,12 @@ static void smbd_smb2_request_find_done(struct tevent_req *subreq)
}
}
-struct smbd_smb2_find_state {
+struct smbd_smb2_query_directory_state {
struct smbd_smb2_request *smb2req;
DATA_BLOB out_output_buffer;
};
-static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
+static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
struct files_struct *fsp,
@@ -209,7 +209,7 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
{
struct smbXsrv_connection *xconn = smb2req->xconn;
struct tevent_req *req;
- struct smbd_smb2_find_state *state;
+ struct smbd_smb2_query_directory_state *state;
struct smb_request *smbreq;
connection_struct *conn = smb2req->tcon->compat;
NTSTATUS status;
@@ -230,14 +230,14 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
char *p;
req = tevent_req_create(mem_ctx, &state,
- struct smbd_smb2_find_state);
+ struct smbd_smb2_query_directory_state);
if (req == NULL) {
return NULL;
}
state->smb2req = smb2req;
state->out_output_buffer = data_blob_null;
- DEBUG(10,("smbd_smb2_find_send: %s - %s\n",
+ DEBUG(10,("smbd_smb2_query_directory_send: %s - %s\n",
fsp_str_dbg(fsp), fsp_fnum_dbg(fsp)));
smbreq = smbd_smb2_fake_smb_request(smb2req);
@@ -275,7 +275,7 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
}
if (in_output_buffer_length > xconn->smb2.server.max_trans) {
- DEBUG(2,("smbd_smb2_find_send: "
+ DEBUG(2,("smbd_smb2_query_directory_send: "
"client ignored max trans:%s: 0x%08X: 0x%08X\n",
__location__, in_output_buffer_length,
xconn->smb2.server.max_trans));
@@ -418,7 +418,7 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
off = 0;
num = 0;
- DEBUG(8,("smbd_smb2_find_send: dirpath=<%s> dontdescend=<%s>, "
+ DEBUG(8,("smbd_smb2_query_directory_send: dirpath=<%s> dontdescend=<%s>, "
"in_output_buffer_length = %u\n",
fsp->fsp_name->base_name, lp_dont_descend(talloc_tos(), SNUM(conn)),
(unsigned int)in_output_buffer_length ));
@@ -495,13 +495,13 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev);
}
-static NTSTATUS smbd_smb2_find_recv(struct tevent_req *req,
+static NTSTATUS smbd_smb2_query_directory_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
DATA_BLOB *out_output_buffer)
{
NTSTATUS status;
- struct smbd_smb2_find_state *state = tevent_req_data(req,
- struct smbd_smb2_find_state);
+ struct smbd_smb2_query_directory_state *state = tevent_req_data(req,
+ struct smbd_smb2_query_directory_state);
if (tevent_req_is_nterror(req, &status)) {
tevent_req_received(req);
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index d174fe6..8725ef2 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -115,7 +115,7 @@ static const struct smbd_smb2_dispatch_table {
_OP(SMB2_OP_KEEPALIVE),
.as_root = true,
},{
- _OP(SMB2_OP_FIND),
+ _OP(SMB2_OP_QUERY_DIRECTORY),
.need_session = true,
.need_tcon = true,
.fileid_ofs = 0x08,
@@ -2307,10 +2307,10 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
return_value = smbd_smb2_request_process_keepalive(req);
break;
- case SMB2_OP_FIND:
+ case SMB2_OP_QUERY_DIRECTORY:
SMBPROFILE_IOBYTES_ASYNC_START(smb2_find, profile_p,
req->profile, _INBYTES(req));
- return_value = smbd_smb2_request_process_find(req);
+ return_value = smbd_smb2_request_process_query_directory(req);
break;
case SMB2_OP_NOTIFY:
diff --git a/source3/wscript_build b/source3/wscript_build
index 8870e9f..6fa5931 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -583,7 +583,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
smbd/smb2_ioctl_named_pipe.c
smbd/smb2_ioctl_network_fs.c
smbd/smb2_keepalive.c
- smbd/smb2_find.c
+ smbd/smb2_query_directory.c
smbd/smb2_notify.c
smbd/smb2_getinfo.c
smbd/smb2_setinfo.c
diff --git a/source4/libcli/smb2/find.c b/source4/libcli/smb2/find.c
index 2fb52a9..2e0bd35 100644
--- a/source4/libcli/smb2/find.c
+++ b/source4/libcli/smb2/find.c
@@ -33,7 +33,7 @@ struct smb2_request *smb2_find_send(struct smb2_tree *tree, struct smb2_find *io
struct smb2_request *req;
NTSTATUS status;
- req = smb2_request_init_tree(tree, SMB2_OP_FIND, 0x20, true, 0);
+ req = smb2_request_init_tree(tree, SMB2_OP_QUERY_DIRECTORY, 0x20, true, 0);
if (req == NULL) return NULL;
SCVAL(req->out.body, 0x02, io->in.level);
diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c
index 19ab20b..9187310 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -452,7 +452,7 @@ static NTSTATUS smb2srv_reply(struct smb2srv_request *req)
case SMB2_OP_KEEPALIVE:
smb2srv_keepalive_recv(req);
return NT_STATUS_OK;
- case SMB2_OP_FIND:
+ case SMB2_OP_QUERY_DIRECTORY:
if (!req->session) goto nosession;
if (!req->tcon) goto notcon;
smb2srv_find_recv(req);
diff --git a/lib/update-external.sh b/third_party/update.sh
similarity index 83%
rename from lib/update-external.sh
rename to third_party/update.sh
index b6b5d11..5248d95 100755
--- a/lib/update-external.sh
+++ b/third_party/update.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-# Pull in a new snapshot of external projects that are included in
+# Pull in a new snapshot of external projects that are included in
# our source tree for users that don't have them installed on their system
# Third party directory
-THIRD_PARTY_DIR="`dirname $0`/../third_party"
+THIRD_PARTY_DIR="`dirname $0`"
# Library directory where projects live that haven't been migrated to
# $THIRD_PARTY_DIR yet.
WORKDIR="`mktemp -d`"
@@ -28,4 +28,9 @@ hg clone https://bitbucket.org/micktwomey/pyiso8601 "$WORKDIR/pyiso8601"
rm -rf "$WORKDIR/pyiso8601/.hg"
rsync -avz --delete "$WORKDIR/pyiso8601/" "$THIRD_PARTY_DIR/pyiso8601/"
+echo "Updating waf..."
+git clone git://git.samba.org/third_party/waf.waf15/ "$WORKDIR/waf"
+rm -rf "$WORKDIR/waf/.git"
+rsync -C -avz --delete "$WORKDIR/waf/" "$THIRD_PARTY_DIR/waf/"
+
rm -rf "$WORKDIR"
diff --git a/buildtools/wafadmin/3rdparty/ParallelDebug.py b/third_party/waf/wafadmin/3rdparty/ParallelDebug.py
similarity index 99%
rename from buildtools/wafadmin/3rdparty/ParallelDebug.py
rename to third_party/waf/wafadmin/3rdparty/ParallelDebug.py
index 9d0493e..0ff580e 100644
--- a/buildtools/wafadmin/3rdparty/ParallelDebug.py
+++ b/third_party/waf/wafadmin/3rdparty/ParallelDebug.py
@@ -295,5 +295,3 @@ function hideInfo(evt) {
#node = producer.bld.path.make_node('pdebug.svg')
f = open('pdebug.svg', 'w')
f.write("".join(out))
-
-
diff --git a/buildtools/wafadmin/3rdparty/batched_cc.py b/third_party/waf/wafadmin/3rdparty/batched_cc.py
similarity index 99%
rename from buildtools/wafadmin/3rdparty/batched_cc.py
rename to third_party/waf/wafadmin/3rdparty/batched_cc.py
index 8e31074..7ed569c 100644
--- a/buildtools/wafadmin/3rdparty/batched_cc.py
+++ b/third_party/waf/wafadmin/3rdparty/batched_cc.py
@@ -180,4 +180,3 @@ for c in ['cc', 'cxx']:
setattr(t, 'post_run', post_run)
setattr(t, 'old_can_retrieve_cache', t.can_retrieve_cache)
setattr(t, 'can_retrieve_cache', can_retrieve_cache)
-
diff --git a/buildtools/wafadmin/3rdparty/boost.py b/third_party/waf/wafadmin/3rdparty/boost.py
similarity index 99%
rename from buildtools/wafadmin/3rdparty/boost.py
rename to third_party/waf/wafadmin/3rdparty/boost.py
index e690a4e..1cbbf7e 100644
--- a/buildtools/wafadmin/3rdparty/boost.py
+++ b/third_party/waf/wafadmin/3rdparty/boost.py
@@ -340,4 +340,3 @@ def check_boost(self, *k, **kw):
self.check_message_2(kw['okmsg'])
return ret
-
diff --git a/buildtools/wafadmin/3rdparty/build_file_tracker.py b/third_party/waf/wafadmin/3rdparty/build_file_tracker.py
similarity index 99%
rename from buildtools/wafadmin/3rdparty/build_file_tracker.py
rename to third_party/waf/wafadmin/3rdparty/build_file_tracker.py
index 9c48928..5fc7358 100644
--- a/buildtools/wafadmin/3rdparty/build_file_tracker.py
+++ b/third_party/waf/wafadmin/3rdparty/build_file_tracker.py
@@ -51,4 +51,3 @@ def signature(self):
Task.Task.signature_bak = Task.Task.signature # unused, kept just in case
Task.Task.signature = signature # overridden
-
diff --git a/buildtools/wafadmin/3rdparty/fluid.py b/third_party/waf/wafadmin/3rdparty/fluid.py
similarity index 99%
rename from buildtools/wafadmin/3rdparty/fluid.py
rename to third_party/waf/wafadmin/3rdparty/fluid.py
index 117edef..c858fe3 100644
--- a/buildtools/wafadmin/3rdparty/fluid.py
+++ b/third_party/waf/wafadmin/3rdparty/fluid.py
@@ -24,4 +24,3 @@ def fluid(self, node):
def detect(conf):
fluid = conf.find_program('fluid', var='FLUID', mandatory=True)
conf.check_cfg(path='fltk-config', package='', args='--cxxflags --ldflags', uselib_store='FLTK', mandatory=True)
-
diff --git a/buildtools/wafadmin/3rdparty/gccdeps.py b/third_party/waf/wafadmin/3rdparty/gccdeps.py
similarity index 99%
rename from buildtools/wafadmin/3rdparty/gccdeps.py
rename to third_party/waf/wafadmin/3rdparty/gccdeps.py
index 6600c9c..28a889d 100644
--- a/buildtools/wafadmin/3rdparty/gccdeps.py
+++ b/third_party/waf/wafadmin/3rdparty/gccdeps.py
@@ -125,4 +125,3 @@ for name in 'cc cxx'.split():
cls.post_run = post_run
cls.scan = scan
cls.sig_implicit_deps = sig_implicit_deps
-
diff --git a/buildtools/wafadmin/3rdparty/go.py b/third_party/waf/wafadmin/3rdparty/go.py
similarity index 99%
rename from buildtools/wafadmin/3rdparty/go.py
rename to third_party/waf/wafadmin/3rdparty/go.py
index 2d8df0d..f8397c7 100644
--- a/buildtools/wafadmin/3rdparty/go.py
+++ b/third_party/waf/wafadmin/3rdparty/go.py
@@ -108,4 +108,3 @@ def apply_golink(self):
self.path.find_or_declare(self.target))
--
Samba Shared Repository
More information about the samba-cvs
mailing list