libcli/smb: move source3/libsmb/read_smb.* to the toplevel

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Oct 24 10:18:06 CEST 2011 on sn-devel-104

diff --git a/source3/libsmb/read_smb.c b/libcli/smb/read_smb.c
similarity index 97%
rename from source3/libsmb/read_smb.c
rename to libcli/smb/read_smb.c
index 9c3d8f1e73c79a76f4fde67f3f6574ecf734ed58..26816c3be38f05e5767ae241988e17d159f99ac9 100644 (file)
--- a/source3/libsmb/read_smb.c
+++ b/libcli/smb/read_smb.c
@@ -18,9 +18,11 @@
 */
 
 #include "includes.h"
+#include "system/network.h"
 #include "lib/async_req/async_sock.h"
 #include "read_smb.h"
 #include "lib/util/tevent_unix.h"
+#include "libcli/smb/smb_constants.h"
 
 /*
  * Read an smb packet asynchronously, discard keepalives

diff --git a/source3/libsmb/read_smb.h b/libcli/smb/read_smb.h
similarity index 100%
rename from source3/libsmb/read_smb.h
rename to libcli/smb/read_smb.h

diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 63349586f45e830d2cfd043e7fe5b89d457f43f9..9339b960448db41ba5f613747b2bc3315fdfd0e2 100644 (file)
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -2,13 +2,14 @@
 
 
 bld.SAMBA_LIBRARY('cli_smb_common',
-       source='smb_seal.c smb2_create_blob.c smb2_signing.c util.c',
+       source='smb_seal.c smb2_create_blob.c smb2_signing.c util.c read_smb.c',
        autoproto='smb_common_proto.h',
-       deps='LIBCRYPTO errors gssapi gensec KRB5_WRAP',
+       deps='LIBCRYPTO errors gssapi gensec KRB5_WRAP LIBASYNC_REQ',
        public_deps='talloc samba-util',
        private_library=True,
        public_headers='''smb_common.h smb2_constants.h smb_constants.h
                        smb_seal.h
                        smb2_create_blob.h smb2_signing.h smb_util.h smb_unix_ext.h
+                       read_smb.h
        ''',
        )

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 62aff34094aed6ce57380d61a254460864b40870..6f216c67b8cb684aea11e85f2dd3916f4d5902ab 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -603,8 +603,9 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \
             libsmb/clioplock.o libsmb/clirap2.o \
             libsmb/async_smb.o \
-            libsmb/read_smb.o libsmb/clisigning.o \
+            libsmb/clisigning.o \
             ../libcli/smb/smb_seal.o \
+            ../libcli/smb/read_smb.o \
             libsmb/smb2cli_base.o \
             libsmb/smb2cli_negprot.o \
             libsmb/smb2cli_session.o \

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 3786638a0d05e16a19711ef5e9abd9a4c3291de2..283dec6a5a3f4000ec0f4ef7f6888f853c38db47 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -25,7 +25,7 @@
 #include "async_smb.h"
 #include "../libcli/smb/smb_seal.h"
 #include "libsmb/nmblib.h"
-#include "read_smb.h"
+#include "../libcli/smb/read_smb.h"
 
 static NTSTATUS cli_pull_raw_error(const uint8_t *buf)
 {

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index da47bc512c82dd64d32f51568cbf557bfcfd466f..391903bf3b795b757940b33af23a1c9575ee4063 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -32,7 +32,6 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/nmblib.h"
-#include "read_smb.h"
 #include "librpc/ndr/libndr.h"
 
 static const struct {

diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index 52b7d0586a3dd2a0d6ff266beeacd8591bed99b9..3563af12ef364fff95510d29a8003b09eabd4b50 100644 (file)
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "client.h"
-#include "read_smb.h"
+#include "libcli/smb/read_smb.h"
 #include "smb2cli_base.h"
 #include "libsmb/proto.h"
 #include "lib/async_req/async_sock.h"

diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c
index 1bb076eee6b63a5feac42d51a2a7a22a482b5fec..1926445c10205eece5e6e5b7d5ce48861645b837 100644 (file)
--- a/source3/libsmb/smbsock_connect.c
+++ b/source3/libsmb/smbsock_connect.c
@@ -23,7 +23,7 @@
 #include "../lib/util/tevent_unix.h"
 #include "client.h"
 #include "async_smb.h"
-#include "read_smb.h"
+#include "../libcli/smb/read_smb.h"
 #include "libsmb/nmblib.h"
 
 struct cli_session_request_state {

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index d70065aef72455f2e9ee526e334706a06d75beb7..e42684dc0194572cdb7141d4fb33847bf0e54a38 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -39,7 +39,7 @@
 #include "libsmb/nmblib.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "util_tdb.h"
-#include "libsmb/read_smb.h"
+#include "../libcli/smb/read_smb.h"
 
 extern char *optarg;
 extern int optind;

diff --git a/source3/wscript_build b/source3/wscript_build
index 1c43be3b20d6f4207e7f69c24023040eee288ea3..26a1ea200fd9bcabe8937a72a83c2c4c3ee7e151 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -127,7 +127,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
              libsmb/clioplock.c libsmb/clirap2.c
              libsmb/async_smb.c
-             libsmb/read_smb.c libsmb/clisigning.c
+             libsmb/clisigning.c
              libsmb/smb2cli_base.c
              libsmb/smb2cli_negprot.c
              libsmb/smb2cli_session.c
@@ -874,7 +874,8 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
 bld.SAMBA3_LIBRARY('smbconf',
                    source=LIB_SMBCONF_SRC,
                    deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc param
-                   util_reg samba-util errors3 charset SAMBA_VERSION''',
+                   util_reg samba-util errors3 charset SAMBA_VERSION
+                   cli_smb_common''',
                    public_headers='../lib/smbconf/smbconf.h',
                    pc_files=[],
                    vnum='0')