From 1df883aa39ce69b040f9d9e72125bf4b80c714a9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 12 Aug 2009 17:52:55 +0200
Subject: libcli: move some common SMB and SMB2 stuff into libcli/smb/

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

metze
---
 source3/smbd/smb2_break.c     | 2 +-
 source3/smbd/smb2_close.c     | 2 +-
 source3/smbd/smb2_create.c    | 2 +-
 source3/smbd/smb2_find.c      | 2 +-
 source3/smbd/smb2_flush.c     | 2 +-
 source3/smbd/smb2_getinfo.c   | 2 +-
 source3/smbd/smb2_glue.c      | 2 +-
 source3/smbd/smb2_ioctl.c     | 2 +-
 source3/smbd/smb2_keepalive.c | 2 +-
 source3/smbd/smb2_lock.c      | 2 +-
 source3/smbd/smb2_negprot.c   | 2 +-
 source3/smbd/smb2_notify.c    | 2 +-
 source3/smbd/smb2_read.c      | 2 +-
 source3/smbd/smb2_server.c    | 2 +-
 source3/smbd/smb2_sesssetup.c | 2 +-
 source3/smbd/smb2_setinfo.c   | 2 +-
 source3/smbd/smb2_signing.c   | 2 +-
 source3/smbd/smb2_tcon.c      | 2 +-
 source3/smbd/smb2_write.c     | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index 29c55fccf6..449b8f6f4d 100644
--- 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 acb5da7751..b28fb72979 100644
--- 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 fe414bb897..43b1fcb43d 100644
--- 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 59c0a67ceb..f28ae1974b 100644
--- 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 e0538529cf..bfdb2d8738 100644
--- 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 cd612d1085..1c247d7a0c 100644
--- 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 5fa3bd2249..d5a6217aa3 100644
--- 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 aa93ca38ce..333616ab61 100644
--- 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 0028fd3608..6645a00dad 100644
--- 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 d515f18eda..eab95f666d 100644
--- 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 a60ea63b00..2c6449dbaa 100644
--- 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 dbcdbac99a..390bb578a4 100644
--- 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 1756c15872..0b46567d60 100644
--- 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 85b3573eb0..1b22c82724 100644
--- 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 9b1dc8cdf8..4724516f2e 100644
--- 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 996b190ffd..5cb6714477 100644
--- 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 e584dd91ca..a7d2605318 100644
--- 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 4ed3fb5686..7d627c2dfa 100644
--- 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 2151d22e9f..d9fa46f5ca 100644
--- 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,
-- 
cgit