libcli: move some common SMB and SMB2 stuff into libcli/smb/

This will hold code that's shared between source3 and source4.

metze

diff --git a/source4/libcli/smb2/smb2_constants.h b/libcli/smb/smb2_constants.h
similarity index 100%
rename from source4/libcli/smb2/smb2_constants.h
rename to libcli/smb/smb2_constants.h

diff --git a/libcli/smb/smb_common.h b/libcli/smb/smb_common.h
new file mode 100644 (file)
index 0000000..f5994d4
--- /dev/null
+++ b/libcli/smb/smb_common.h
@@ -0,0 +1,27 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   SMB and SMB2 common header
+
+   Copyright (C) Stefan Metzmacher 2009
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __LIBCLI_SMB_SMB_COMMON_H__
+#define __LIBCLI_SMB_SMB_COMMON_H__
+
+#include "../libcli/smb/smb2_constants.h"
+
+#endif

diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index 29c55fccf6ac766ff356d00aa16a68dcc2f626ad..449b8f6f4d7b2db46b7520c17413136701188c73 100644 (file)
--- a/source3/smbd/smb2_break.c
+++ b/source3/smbd/smb2_break.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_oplock_break_send(TALLOC_CTX *mem_ctx,
                                                      struct tevent_context *ev,

diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
index acb5da775133076b21edc7765bdae206301865b4..b28fb7297937eb1d3f4d52770f722d87412914c7 100644 (file)
--- a/source3/smbd/smb2_close.c
+++ b/source3/smbd/smb2_close.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static NTSTATUS smbd_smb2_close(struct smbd_smb2_request *req,
                                uint16_t in_flags,

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index fe414bb8979ea5c62e0fca51ff80312494175508..43b1fcb43deb320379bc05fcd0c4a8c1ea25b13a 100644 (file)
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                                struct tevent_context *ev,

diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c
index 59c0a67ceb212394b0d4b171cb7fe6f63abca432..f28ae1974b8709a3bd138451932eccc23f8b64c0 100644 (file)
--- a/source3/smbd/smb2_find.c
+++ b/source3/smbd/smb2_find.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,

diff --git a/source3/smbd/smb2_flush.c b/source3/smbd/smb2_flush.c
index e0538529cf25ef40e1d2dd11d996181129c7784c..bfdb2d87384a5712df30984bfba8cc6c97e8ec17 100644 (file)
--- a/source3/smbd/smb2_flush.c
+++ b/source3/smbd/smb2_flush.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_flush_send(TALLOC_CTX *mem_ctx,
                                               struct tevent_context *ev,

diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index cd612d1085c185fd687f813c973aec527c38c5d6..1c247d7a0c57b93c15dce3485625b58bd46c9c01 100644 (file)
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                                                 struct tevent_context *ev,

diff --git a/source3/smbd/smb2_glue.c b/source3/smbd/smb2_glue.c
index 5fa3bd2249958bb0d7fd76cd94743f98282333d4..d5a6217aa31e5be5e83134e51beda0a06c55ca11 100644 (file)
--- a/source3/smbd/smb2_glue.c
+++ b/source3/smbd/smb2_glue.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req)
 {

diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c
index aa93ca38ced5e5d697a21fcb25df2a0c13ad91f5..333616ab6143b6552c3e04df69edbe34f7e8cd3f 100644 (file)
--- a/source3/smbd/smb2_ioctl.c
+++ b/source3/smbd/smb2_ioctl.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_ioctl_send(TALLOC_CTX *mem_ctx,
                                               struct tevent_context *ev,

diff --git a/source3/smbd/smb2_keepalive.c b/source3/smbd/smb2_keepalive.c
index 0028fd3608457df74cb72cec50cc9d9bd6f0caa2..6645a00dad8adba9856d3994fef21b684d640753 100644 (file)
--- a/source3/smbd/smb2_keepalive.c
+++ b/source3/smbd/smb2_keepalive.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req)
 {

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index d515f18eda3e5a47e5a8008167a80bc6cd29c818..eab95f666dbc99f74996d3476d74fd0ad5fef9a6 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 struct smbd_smb2_lock_element {
        uint64_t offset;

diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index a60ea63b0094f1169d21b1350c7249c806fa8946..2c6449dbaa83380320f01dbfac7413b572a0b8ba 100644 (file)
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 extern enum protocol_types Protocol;
 

diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c
index dbcdbac99a478b5c7224559a05752e84af03975e..390bb578a43a45e8984f32919b6ea3168dc6c9ba 100644 (file)
--- a/source3/smbd/smb2_notify.c
+++ b/source3/smbd/smb2_notify.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_notify_send(TALLOC_CTX *mem_ctx,
                                                struct tevent_context *ev,

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 1756c15872187f8d3f416b8fdec9c44f5b52765c..0b46567d60760f9cfeb158e2c39fc56c7429584e 100644 (file)
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 85b3573eb045fa36dd94a076f85fa1cd74232850..1b22c8272459de7792691d0faa6380adfaa24469 100644 (file)
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 #include "../lib/tsocket/tsocket.h"
 
 bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size)

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 9b1dc8cdf88afa57a9d42626a2547bd81918fc8d..4724516f2e4ba1ba8390d6bfd9e875019373c7fd 100644 (file)
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req,
                                        uint64_t in_session_id,

diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 996b190ffde28ad8288df39c0ced0ae0d34a1826..5cb6714477f6cb8cb873411b1e3a1382c38d620e 100644 (file)
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
                                                 struct tevent_context *ev,

diff --git a/source3/smbd/smb2_signing.c b/source3/smbd/smb2_signing.c
index e584dd91ca6c2087682efbb64a3eece97a021acc..a7d2605318aac5c7069e7aca1b1394d34e75932d 100644 (file)
--- a/source3/smbd/smb2_signing.c
+++ b/source3/smbd/smb2_signing.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 #include "../lib/crypto/crypto.h"
 
 NTSTATUS smb2_signing_sign_pdu(DATA_BLOB session_key,

diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index 4ed3fb5686070c12df8f82d2c014a752dea4ee16..7d627c2dfa27bddf04f6522e4968701272cb74dc 100644 (file)
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req,
                                       const char *in_path,

diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 2151d22e9f3cc638a563a6c59579ef47a113c705..d9fa46f5cabfb3a06a7341ba28a21faca2de9b0c 100644 (file)
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 
 static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
                                               struct tevent_context *ev,

diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 75b7175ac337964b0383785562dd115e7980b04d..ad5f5bf2237363e71a50a359fae53222d75545b6 100644 (file)
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -23,7 +23,7 @@
 #define __LIBCLI_RAW_INTERFACES_H__
 
 #include "libcli/raw/smb.h"
-#include "libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
 #include "librpc/gen_ndr/misc.h" /* for struct GUID */
 
 /* this structure is just a wrapper for a string, the only reason we

diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 6372cd805b4bd391f731a2639a777e4214ac2171..fdd2d6f6fc20d44f3e7952069a009c09580ea432 100644 (file)
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -24,7 +24,6 @@
 
 #include "libcli/raw/request.h"
 #include "libcli/raw/libcliraw.h"
-#include "libcli/smb2/smb2_constants.h"
 
 struct smb2_handle;
 struct smb2_lease_break;