s4: rename source4/smbd/ to source4/samba/

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Nov 27 10:07:18 UTC 2020 on sn-devel-184

14 files changed, 18 insertions, 18 deletions

diff --git a/source4/smb_server/management.c b/source4/smb_server/management.c
index af993717ef7..5cdfff0d801 100644
--- a/source4/smb_server/management.c
+++ b/source4/smb_server/management.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "auth/auth.h"
diff --git a/source4/smb_server/service_smb.c b/source4/smb_server/service_smb.c
index 37e8a61afb5..2215ba18862 100644
--- a/source4/smb_server/service_smb.c
+++ b/source4/smb_server/service_smb.c
@@ -19,9 +19,9 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/service_smb_proto.h"
 #include "lib/messaging/irpc.h"
diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index 04b69dd9883..cd2451d2e9c 100644
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -25,7 +25,7 @@
 #include "smb_server/smb_server.h"
 #include "libcli/smb2/smb2.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/stream/packet.h"
 #include "param/param.h"
 
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index 8a05ecee56f..b96cdbd821b 100644
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "lib/util/server_id.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "smb_server/smb_server.h"
 #include "system/filesys.h"
 #include "param/param.h"
diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index 41854a1f0f1..0f3171fb68e 100644
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/stream/packet.h"
 #include "ntvfs/ntvfs.h"
 
diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c
index c23b470e472..eb1874c4d51 100644
--- a/source4/smb_server/smb/service.c
+++ b/source4/smb_server/smb/service.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
 
diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c
index 13f13934412..68cdd70feff 100644
--- a/source4/smb_server/smb/sesssetup.c
+++ b/source4/smb_server/smb/sesssetup.c
@@ -28,7 +28,7 @@
 #include "auth/gensec/gensec.h"
 #include "auth/auth.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "param/param.h"
 #include "../lib/tsocket/tsocket.h"
 #include "lib/stream/packet.h"
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index 447095c5008..fc357ed73f9 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "libcli/raw/libcliraw.h"
diff --git a/source4/smb_server/smb2/negprot.c b/source4/smb_server/smb2/negprot.c
index c433eb194bd..048d7b46837 100644
--- a/source4/smb_server/smb2/negprot.c
+++ b/source4/smb_server/smb2/negprot.c
@@ -28,7 +28,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "param/param.h"
 
 static NTSTATUS smb2srv_negprot_secblob(struct smb2srv_request *req, DATA_BLOB *_blob)
diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c
index 04241abcc39..c4109bfbc2f 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -24,7 +24,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/stream/packet.h"
 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
diff --git a/source4/smb_server/smb2/sesssetup.c b/source4/smb_server/smb2/sesssetup.c
index 501aab671d7..a8c45608cae 100644
--- a/source4/smb_server/smb2/sesssetup.c
+++ b/source4/smb_server/smb2/sesssetup.c
@@ -26,7 +26,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/stream/packet.h"
 
 static void smb2srv_sesssetup_send(struct smb2srv_request *req, union smb_sesssetup *io)
diff --git a/source4/smb_server/smb2/tcon.c b/source4/smb_server/smb2/tcon.c
index b2d104329a1..0c564206a08 100644
--- a/source4/smb_server/smb2/tcon.c
+++ b/source4/smb_server/smb2/tcon.c
@@ -22,7 +22,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "ntvfs/ntvfs.h"
 
 /*
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 0b80f2fbd20..57810c08a96 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -19,9 +19,9 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/service_smb_proto.h"
 #include "lib/messaging/irpc.h"
diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c
index 34c303c53b0..39bc0a5ff5f 100644
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/tsocket/tsocket.h"
 #include "ntvfs/ntvfs.h"