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

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 4c216695a1f44b759b21b01e65a68275606de905..69aabbe3ca1c0885247ced2043cc2620e510aa3e 100644 (file)
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -24,8 +24,8 @@
 #include "tevent.h"
 #include "system/filesys.h"
 #include "lib/param/param.h"
-#include "source4/smbd/service.h"
-#include "source4/smbd/process_model.h"
+#include "source4/samba/service.h"
+#include "source4/samba/process_model.h"
 #include "dynconfig.h"
 #include "nsswitch/winbind_client.h"
 

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 511832608336ce0ca31122954a5d3fa9b469373e..3a8b3be7a63382cb5ccf967b5e73415dfc470514 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -22,8 +22,8 @@
 #include "includes.h"
 #include <talloc.h>
 #include "lib/messaging/irpc.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "cldap_server/cldap_server.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"

diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c
index a5e1c6b5c4e55334553d6b0bced2bf063d559138..89f0a66b0ada127d22eaca07d4aa5c00a8da222e 100644 (file)
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -23,7 +23,7 @@
 #include <tevent.h>
 #include <ldb.h>
 #include <ldb_errors.h>
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "cldap_server/cldap_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"

diff --git a/source4/dns_server/dns_query.c b/source4/dns_server/dns_query.c
index 762bcca6fb6503257bc77b4d73d8f4c641655a92..181beda219b5feabd94bd24eed66072bd30f17f0 100644 (file)
--- a/source4/dns_server/dns_query.c
+++ b/source4/dns_server/dns_query.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "libcli/util/werror.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_dns.h"

diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 43ea88158ce9e6da74af6f45a10ebccddfc01dcb..f9b14ed49dbbfd99e335bb8873900c4f2d09bd0f 100644 (file)
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -20,10 +20,10 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
-#include "smbd/service_stream.h"
-#include "smbd/process_model.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
+#include "samba/service_stream.h"
+#include "samba/process_model.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
 #include "lib/tsocket/tsocket.h"

diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index f9866611119739df42701ffb42db0f83aeb6cc87..b6d39e4c034053d644d5014c9760fce8bac42f28 100644 (file)
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -29,7 +29,7 @@
 #include "param/loadparm.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "dns_server/dns_server.h"
 #include "auth/auth.h"
 

diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index 4a81d06b0977ae9e6e9d11f934a4733fcb656cc7..dd94564c99659a913440dfd6f963e01778c18609 100644 (file)
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -31,7 +31,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "param/param.h"
 #include "system/filesys.h"

diff --git a/source4/dsdb/kcc/kcc_connection.c b/source4/dsdb/kcc/kcc_connection.c
index 6a20dea1d140bb1f340563ca0937e64a58720578..f387dfcb0feb783bf9054e534c3d8728905fe21f 100644 (file)
--- a/source4/dsdb/kcc/kcc_connection.c
+++ b/source4/dsdb/kcc/kcc_connection.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"
 #include "dsdb/kcc/kcc_connection.h"

diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c
index 3f16de8cb6d59b89c21f129fc577c8e1fc979e98..edd0710c4a2c436030127837000a10385b534ac2 100644 (file)
--- a/source4/dsdb/kcc/kcc_drs_replica_info.c
+++ b/source4/dsdb/kcc/kcc_drs_replica_info.c
@@ -24,7 +24,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/proto.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"

diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c
index c6ee6d89dfdc185473cf6cfcdee2f43902604a95..c37b858785203ce6220a1bdc30f5cfbaa30b1843 100644 (file)
--- a/source4/dsdb/kcc/kcc_periodic.c
+++ b/source4/dsdb/kcc/kcc_periodic.c
@@ -24,7 +24,7 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_connection.h"
 #include "dsdb/kcc/kcc_service.h"

diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c
index 13c78976e3afb65c59df24c7365a5a82bbd04343..066cc070c30470b998579316298496e05823e93e 100644 (file)
--- a/source4/dsdb/kcc/kcc_service.c
+++ b/source4/dsdb/kcc/kcc_service.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
 #include "dsdb/kcc/kcc_service.h"

diff --git a/source4/dsdb/repl/drepl_extended.c b/source4/dsdb/repl/drepl_extended.c
index e2f85893ae8074a382bb6d025167fc0c1f1f8fd8..8b5bb6faf6308d577ef225efa7465dd4fbca11e9 100644 (file)
--- a/source4/dsdb/repl/drepl_extended.c
+++ b/source4/dsdb/repl/drepl_extended.c
@@ -27,7 +27,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 

diff --git a/source4/dsdb/repl/drepl_fsmo.c b/source4/dsdb/repl/drepl_fsmo.c
index be707a9c238d186b338ace79798f88fd2a2dad58..3c3cbad8f21d34abe738bcbcc8b49f0ceed28fc6 100644 (file)
--- a/source4/dsdb/repl/drepl_fsmo.c
+++ b/source4/dsdb/repl/drepl_fsmo.c
@@ -27,7 +27,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 

diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c
index a811f97e2748ab2d2075c42025dc2c257435a4d3..20be3b53dd0e40be4a5662bee0804966b49075fe 100644 (file)
--- a/source4/dsdb/repl/drepl_notify.c
+++ b/source4/dsdb/repl/drepl_notify.c
@@ -25,7 +25,7 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"

diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index afe25d822710541056ccf4c8092116de75a93339..401d2bf2728385acd47f8070061c3dd3df8fbdb7 100644 (file)
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>

diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c
index ea553b4b6d2dc3732939c690e7fe07041e1b1332..fe9bd60c3ef77e9b6803389803a26c2d7c08724a 100644 (file)
--- a/source4/dsdb/repl/drepl_out_pull.c
+++ b/source4/dsdb/repl/drepl_out_pull.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>

diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c
index 57b82131225d3850616949838ff9c065d0e91c47..cc32d5904da8e59decad3d51111c8da288d962f0 100644 (file)
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>

diff --git a/source4/dsdb/repl/drepl_periodic.c b/source4/dsdb/repl/drepl_periodic.c
index d4ed1f013d13b92c566de4296f5ccfa7457b0fa6..4cdc8cba2204d412e15fa43248a8c5d5d6505d80 100644 (file)
--- a/source4/dsdb/repl/drepl_periodic.c
+++ b/source4/dsdb/repl/drepl_periodic.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"

diff --git a/source4/dsdb/repl/drepl_replica.c b/source4/dsdb/repl/drepl_replica.c
index b79b2826eda2e8c2b6d0de131be5b310ef122fbc..05d068306fdea386115ff3c2dc6be5b88dd33973 100644 (file)
--- a/source4/dsdb/repl/drepl_replica.c
+++ b/source4/dsdb/repl/drepl_replica.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

diff --git a/source4/dsdb/repl/drepl_ridalloc.c b/source4/dsdb/repl/drepl_ridalloc.c
index 162df198c209c00558f50343ab4870bac587da7f..6794d4beb6caa6a314ce44102722bf79b8b9bb77 100644 (file)
--- a/source4/dsdb/repl/drepl_ridalloc.c
+++ b/source4/dsdb/repl/drepl_ridalloc.c
@@ -26,7 +26,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 

diff --git a/source4/dsdb/repl/drepl_secret.c b/source4/dsdb/repl/drepl_secret.c
index 70492f58983906297f1dd19cc6a9e570f86a693f..47a8ca9c65ee29df3e9fb74f7e96a5f505eb4896 100644 (file)
--- a/source4/dsdb/repl/drepl_secret.c
+++ b/source4/dsdb/repl/drepl_secret.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 

diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index ee877f2654e5cc9a35e6c7eb7f817f04bfca8e87..02ece26842eae99904cf0f3141ec218e7714a84d 100644 (file)
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "lib/events/events.h"
 #include "dsdb/repl/drepl_service.h"
 #include <ldb_errors.h>

diff --git a/source4/dsdb/samdb/ldb_modules/netlogon.c b/source4/dsdb/samdb/ldb_modules/netlogon.c
index e5ca65f3b36622723aeadfcb88eae946af4caa28..66ab70b6f548ac19def586df290880eb716a03b3 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/netlogon.c
+++ b/source4/dsdb/samdb/ldb_modules/netlogon.c
@@ -24,7 +24,7 @@
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "lib/events/events.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.h"

diff --git a/source4/echo_server/echo_server.c b/source4/echo_server/echo_server.c
index c81fc140a0a57d113cf5dae210a873d134812904..54ab719cfaf56b70d5110a99e95bf5de4a1caef3 100644 (file)
--- a/source4/echo_server/echo_server.c
+++ b/source4/echo_server/echo_server.c
@@ -24,7 +24,7 @@
 /* Get at the config file settings */
 #include "param/param.h"
 /* This defines task_server_terminate */
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 /* We get load_interface_list from here */
 #include "socket/netif.h"
 /* NTSTATUS-related stuff */

diff --git a/source4/kdc/kdc-heimdal.c b/source4/kdc/kdc-heimdal.c
index ee4e1387def322fe75cff277799d4f48ddecb225..a3c357ca1a669b54c60ae8b89866ff6cc6ac92ae 100644 (file)
--- a/source4/kdc/kdc-heimdal.c
+++ b/source4/kdc/kdc-heimdal.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "lib/tsocket/tsocket.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"

diff --git a/source4/kdc/kdc-proxy.c b/source4/kdc/kdc-proxy.c
index 0f84906338fb426901aede187524e69c52256f45..64160b3434d9cf5b13f63375d26778189e338202 100644 (file)
--- a/source4/kdc/kdc-proxy.c
+++ b/source4/kdc/kdc-proxy.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/util/tstream.h"
 #include "lib/util/tevent_ntstatus.h"

diff --git a/source4/kdc/kdc-server.c b/source4/kdc/kdc-server.c
index 00b5c745fec3dcc22709062c0ed43df7c0d1bc63..de0ae8d1a725e672d1a844f0e2c1d2e844537fc2 100644 (file)
--- a/source4/kdc/kdc-server.c
+++ b/source4/kdc/kdc-server.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "param/param.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/util/tstream.h"
 #include "kdc/kdc-server.h"

diff --git a/source4/kdc/kdc-service-mit.c b/source4/kdc/kdc-service-mit.c
index dd6902f083d52694eb4bbfe1bed69e23dac5840c..5d4180aa7cc4a384032121e775eb3433e8fee8a7 100644 (file)
--- a/source4/kdc/kdc-service-mit.c
+++ b/source4/kdc/kdc-service-mit.c
@@ -25,8 +25,8 @@
 #include "system/filesys.h"
 #include "lib/param/param.h"
 #include "lib/util/samba_util.h"
-#include "source4/smbd/service.h"
-#include "source4/smbd/process_model.h"
+#include "source4/samba/service.h"
+#include "source4/samba/process_model.h"
 #include "kdc/kdc-service-mit.h"
 #include "dynconfig.h"
 #include "libds/common/roles.h"

diff --git a/source4/kdc/kpasswd-service-heimdal.c b/source4/kdc/kpasswd-service-heimdal.c
index 12c7402bf3fb3667ddca2b48e1719d0a11efe97c..c804852c3a76e32e6b3be350eac283bdda541b14 100644 (file)
--- a/source4/kdc/kpasswd-service-heimdal.c
+++ b/source4/kdc/kpasswd-service-heimdal.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "param/param.h"
 #include "auth/auth.h"
 #include "auth/gensec/gensec.h"

diff --git a/source4/kdc/kpasswd-service-mit.c b/source4/kdc/kpasswd-service-mit.c
index 9a014c058fe7c6de35dac164fe9ee9d89d036dee..2117c1c169624c3cf837a5d619a2219bf849f9c1 100644 (file)
--- a/source4/kdc/kpasswd-service-mit.c
+++ b/source4/kdc/kpasswd-service-mit.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "param/param.h"
 #include "auth/auth.h"
 #include "auth/gensec/gensec.h"

diff --git a/source4/kdc/kpasswd-service.c b/source4/kdc/kpasswd-service.c
index b36cf402228349226736cba86539d66f0135089c..8f1679e4a28aa5e4d9ce608a46e2c1282ea2c7c2 100644 (file)
--- a/source4/kdc/kpasswd-service.c
+++ b/source4/kdc/kpasswd-service.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "tsocket/tsocket.h"
 #include "auth/credentials/credentials.h"
 #include "auth/auth.h"

diff --git a/source4/kdc/mit_kdc_irpc.c b/source4/kdc/mit_kdc_irpc.c
index e0021710c9f33ed07f2f6a4c12585e1d9856d6d6..33eb74b37f54755f81c40ac3054a9e7612e6d8c4 100644 (file)
--- a/source4/kdc/mit_kdc_irpc.c
+++ b/source4/kdc/mit_kdc_irpc.c
@@ -29,7 +29,7 @@
 
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 
-#include "source4/smbd/process_model.h"
+#include "source4/samba/process_model.h"
 #include "lib/param/param.h"
 
 #include "samba_kdc.h"

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 915d9b94f9b5a2f1846876831ab2b56d127900ad..e19f82cf5dfa3506e988083dea28ae95645b5a01 100644 (file)
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -26,7 +26,7 @@
 #include "auth/gensec/gensec_internal.h" /* TODO: remove this */
 #include "auth/common_auth.h"
 #include "param/param.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "dsdb/samdb/samdb.h"
 #include <ldb_errors.h>
 #include <ldb_module.h>

diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 54493d040fffaa01cc9357969acf2ca336ddae3b..b60dc71d7e7581b9b2796a008a541829be1564ab 100644 (file)
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "ldap_server/ldap_server.h"
 #include "auth/auth.h"
-#include "smbd/service.h"
+#include "samba/service.h"
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"

diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c
index 2d4a5345460fd88f40e12c6c723b8f7440b9665f..e6bf16384f04a89e05c245db062fcff69f3c7fa6 100644 (file)
--- a/source4/ldap_server/ldap_extended.c
+++ b/source4/ldap_server/ldap_extended.c
@@ -21,7 +21,7 @@
 #include "ldap_server/ldap_server.h"
 #include "../lib/util/dlinklist.h"
 #include "lib/tls/tls.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "../lib/util/tevent_ntstatus.h"
 
 struct ldapsrv_starttls_postprocess_context {

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index c2d53eacd3f81c4a774f5b1fb46a20c589106b32..20442ecd9e5706e519ad840d06112743e4e5a32b 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -30,10 +30,10 @@
 #include "../lib/util/dlinklist.h"
 #include "../lib/util/asn1.h"
 #include "ldap_server/ldap_server.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
-#include "smbd/service.h"
-#include "smbd/process_model.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service.h"
+#include "samba/process_model.h"
 #include "lib/tls/tls.h"
 #include "lib/messaging/irpc.h"
 #include <ldb.h>

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index e2ee1000d7b2a6e986ae8b4585f0efc1977523b1..e9d89e52dea283df76aa297438ed6e39fb9f7f06 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -27,7 +27,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "param/param.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "libcli/security/security.h"
 #include "nbt_server/dgram/proto.h"

diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index 978d354abc5428c4ece2bd4f7a5caf14248534f0..8c6a6e9264b466de97625f51cc3b9db4fa5fa405 100644 (file)
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/source4/nbt_server/dgram/ntlogon.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"

diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index 908e8d0f35d9bb7fbbaedb1ad07a91476667fafe..ea2b6e8b98ac0afdaa77afcda2eddd547c2e11d3 100644 (file)
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
 #include "nbt_server/dgram/proto.h"

diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c
index beafec6e6af315c2e8383574ca1446625e9503ea..93e1497c2aeb5c047b7f4f2b353ed60500172904 100644 (file)
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/socket/socket.h"
 #include "nbt_server/wins/winsserver.h"
 #include "nbt_server/dgram/proto.h"

diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index cfe617b53b036e46652412891635d1bec566262e..e835ffd25ab22cb1406b062e0d6582d55ff7c4ee 100644 (file)
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "librpc/gen_ndr/ndr_irpc.h"

diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 00c255cf0d374f3f87ff6e7613ca53187114f40e..6d28bbdbdad1df1ae6984c699322b2d2017b04e5 100644 (file)
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -20,8 +20,8 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "system/network.h"

diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c
index 139549623753c6a01719bde9bffaea94e39f8cd2..b9aea56d3d252b0bfd7caaaba9acbe0732553893 100644 (file)
--- a/source4/nbt_server/packet.c
+++ b/source4/nbt_server/packet.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"

diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c
index 8cf387c2dcd040b13193aacbcecbc4f5d504d663..7e1a76009078d2510ce3b17306afb40e0a4ac472 100644 (file)
--- a/source4/nbt_server/query.c
+++ b/source4/nbt_server/query.c
@@ -24,7 +24,7 @@
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 #include "param/param.h"

diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index 08caa11f8a82ca2dd4a4db66cc189205e7b8ff09..4d10e9b16a23046bb4eb8a3885296c754ad6297f 100644 (file)
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "../lib/util/dlinklist.h"
 #include "nbt_server/nbt_server.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "nbt_server/wins/winsserver.h"

diff --git a/source4/nbt_server/wins/wins_dns_proxy.c b/source4/nbt_server/wins/wins_dns_proxy.c
index 7b85f8d9fea289ba4759bdfa2c6712a509c64afa..95ceb214f3c8742bcd457de6dddf7c4ab5fc96ac 100644 (file)
--- a/source4/nbt_server/wins/wins_dns_proxy.c
+++ b/source4/nbt_server/wins/wins_dns_proxy.c
@@ -25,7 +25,7 @@
 #include "nbt_server/wins/winsserver.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "libcli/resolve/resolve.h"
 #include "lib/socket/socket.h"
 

diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c
index 0636594dddb43b9721306337bf45e1f8135e6980..c1e7f9a65599be23235fc6b2b04d4503c5d1b29a 100644 (file)
--- a/source4/nbt_server/wins/winsclient.c
+++ b/source4/nbt_server/wins/winsclient.c
@@ -25,7 +25,7 @@
 #include "libcli/composite/composite.h"
 #include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "param/param.h"
 
 /* we send WINS client requests using our primary network interface 

diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 98789c0496532905435db5a4b1f61a654eeaed67..a9f3ecd7d29a9ae788991b2624f848dfa5d38263 100644 (file)
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -28,7 +28,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "system/network.h"
 #include "lib/socket/socket.h"
 #include "lib/socket/netif.h"

diff --git a/source4/nbt_server/wins/winswack.c b/source4/nbt_server/wins/winswack.c
index 35875aa8806a09fe13261c05f5a5ba05fb3d1c0f..735a4e6653df8315b42a8f332c341d9e0a25c7e0 100644 (file)
--- a/source4/nbt_server/wins/winswack.c
+++ b/source4/nbt_server/wins/winswack.c
@@ -27,7 +27,7 @@
 #include "system/time.h"
 #include "libcli/composite/composite.h"
 #include "param/param.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 
 struct wins_challenge_state {
        struct wins_challenge_io *io;

diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c
index 44096f71f494b73eed4dbc7ca92c4c356730040f..eab70f1f148cd1a0be6bacd83535c305ee00b54a 100644 (file)
--- a/source4/ntp_signd/ntp_signd.c
+++ b/source4/ntp_signd/ntp_signd.c
@@ -22,10 +22,10 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
-#include "smbd/service_stream.h"
-#include "smbd/process_model.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
+#include "samba/service_stream.h"
+#include "samba/process_model.h"
 #include "lib/stream/packet.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/util/tstream.h"

diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index 8cba72da43979b8514ed6abec0302a30604b4ff8..f50319b5fad8cd54e73405214920f29997436584 100644 (file)
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -23,7 +23,7 @@
 #include "vfs_posix.h"
 #include "system/time.h"
 #include "librpc/gen_ndr/security.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/events/events.h"
 #include "../lib/util/dlinklist.h"
 

diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c
index 460c2f7d9c5985b8e2eed18930613d70734b89d8..21ff33e28f796df4a48c29c067606a4f21a506e2 100644 (file)
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "../lib/util/dlinklist.h"
 #include "vfs_posix.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/messaging/irpc.h"
 
 /* the context for a single wait instance */

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index e64148ef78837db42d61b3b93a3a4f5e0d54881e..ec83f72e91f082ee56692c275fe503971d273680 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -27,10 +27,10 @@
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/dcerpc_server_proto.h"
 #include "param/param.h"
-#include "smbd/service_stream.h"
+#include "samba/service_stream.h"
 #include "lib/tsocket/tsocket.h"
 #include "lib/socket/socket.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "lib/util/samba_modules.h"
 #include "lib/util/tevent_ntstatus.h"
 

diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 96ebc2dbe576998d2c77ece02735d996117d3eb8..ae8d91e68f01bca46e496d402b8fa9aea0655b20 100644 (file)
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -38,7 +38,7 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "libcli/raw/smb.h"
 #include "../libcli/named_pipe_auth/npa_tstream.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 
 struct dcesrv_context_callbacks srv_callbacks = {
        .log.successful_authz = log_successful_dcesrv_authz_event,

diff --git a/source4/smbd/process_model.c b/source4/samba/process_model.c
similarity index 99%
rename from source4/smbd/process_model.c
rename to source4/samba/process_model.c
index b75efac9845601994b83c36cf934d3074c83ad54..754da79ce9f465b5ef9835bbf6f1175d38e1e397 100644 (file)
--- a/source4/smbd/process_model.c
+++ b/source4/samba/process_model.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "param/param.h"
 #include "lib/util/samba_modules.h"
 

diff --git a/source4/smbd/process_model.h b/source4/samba/process_model.h
similarity index 97%
rename from source4/smbd/process_model.h
rename to source4/samba/process_model.h
index 2892dd43c04e75e8464a259b30b9f243c234fcea..446e0f1cf260499c7e03488c7521a7fd681e0733 100644 (file)
--- a/source4/smbd/process_model.h
+++ b/source4/samba/process_model.h
@@ -25,8 +25,8 @@
 #define __PROCESS_MODEL_H__
 
 #include "lib/socket/socket.h"
-#include "smbd/service.h"
-#include "smbd/process_model_proto.h"
+#include "samba/service.h"
+#include "samba/process_model_proto.h"
 
 /* modules can use the following to determine if the interface has changed
  * please increment the version number after each interface change

diff --git a/source4/smbd/process_prefork.c b/source4/samba/process_prefork.c
similarity index 99%
rename from source4/smbd/process_prefork.c
rename to source4/samba/process_prefork.c
index 3c93fc0ee2ae20a7d1967a3f5aca74e4ddc8b382..f3387d87e615eba4dbd1a8fc61a896c3074016c5 100644 (file)
--- a/source4/smbd/process_prefork.c
+++ b/source4/samba/process_prefork.c
@@ -38,7 +38,7 @@
 #include "lib/events/events.h"
 #include "lib/messaging/messaging.h"
 #include "lib/socket/socket.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
 #include "ldb_wrap.h"

diff --git a/source4/smbd/process_single.c b/source4/samba/process_single.c
similarity index 99%
rename from source4/smbd/process_single.c
rename to source4/samba/process_single.c
index 12ed2e30a74621522b381c06c13a450bddec1910..c2ff460f640ff9a5d9c0c2c5ca39ac1728bffdbf 100644 (file)
--- a/source4/smbd/process_single.c
+++ b/source4/samba/process_single.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 

diff --git a/source4/smbd/process_standard.c b/source4/samba/process_standard.c
similarity index 99%
rename from source4/smbd/process_standard.c
rename to source4/samba/process_standard.c
index 5e804807c934088b87ab2ede4350ab2c1cad352c..2820e30eace7dd3a0ef84d17d3fab5e7b65d2214 100644 (file)
--- a/source4/smbd/process_standard.c
+++ b/source4/samba/process_standard.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 #include "param/param.h"

diff --git a/source4/smbd/server.c b/source4/samba/server.c
similarity index 99%
rename from source4/smbd/server.c
rename to source4/samba/server.c
index ee2e7508bb3ab532d76b718470975c3e78a080dc..d3cbd654d76312461ea5d15f31179a09150d5667 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/samba/server.c
@@ -30,7 +30,7 @@
 #include "system/filesys.h"
 #include "auth/gensec/gensec.h"
 #include "libcli/auth/schannel.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "param/secrets.h"
 #include "lib/util/pidfile.h"
 #include "param/param.h"

diff --git a/source4/smbd/service.c b/source4/samba/service.c
similarity index 98%
rename from source4/smbd/service.c
rename to source4/samba/service.c
index e939c85e6898cdee42ab490553b0f158c9a8ddd4..f801e4c8eaba9673f1fa05ec7c8cbc2f1171ce00 100644 (file)
--- a/source4/smbd/service.c
+++ b/source4/samba/service.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 
 #undef strcasecmp
 

diff --git a/source4/smbd/service.h b/source4/samba/service.h
similarity index 95%
rename from source4/smbd/service.h
rename to source4/samba/service.h
index 0b6f937b63ceb5221787b4a763818b49e26a1d90..88d2478dfe560deee25be8e5bc28fefe4f65fa9a 100644 (file)
--- a/source4/smbd/service.h
+++ b/source4/samba/service.h
@@ -24,8 +24,8 @@
 #define __SERVICE_H__
 
 
-#include "smbd/service_stream.h"
-#include "smbd/service_task.h"
+#include "samba/service_stream.h"
+#include "samba/service_task.h"
 
 struct process_details {
        unsigned int instances;
@@ -75,6 +75,6 @@ struct service_details {
        void (*post_fork) (struct task_server *, struct process_details *);
 };
 
-#include "smbd/service_proto.h"
+#include "samba/service_proto.h"
 
 #endif /* __SERVICE_H__ */

diff --git a/source4/smbd/service_named_pipe.c b/source4/samba/service_named_pipe.c
similarity index 99%
rename from source4/smbd/service_named_pipe.c
rename to source4/samba/service_named_pipe.c
index d054c6fdce68b43b263bbf18d57dc41813e572e2..7ba57e24fe864dfd4b6150abed99f34ab59dcda2 100644 (file)
--- a/source4/smbd/service_named_pipe.c
+++ b/source4/samba/service_named_pipe.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include <tevent.h>
-#include "smbd/service.h"
+#include "samba/service.h"
 #include "param/param.h"
 #include "auth/auth.h"
 #include "auth/session.h"

diff --git a/source4/smbd/service_stream.c b/source4/samba/service_stream.c
similarity index 100%
rename from source4/smbd/service_stream.c
rename to source4/samba/service_stream.c

diff --git a/source4/smbd/service_stream.h b/source4/samba/service_stream.h
similarity index 100%
rename from source4/smbd/service_stream.h
rename to source4/samba/service_stream.h

diff --git a/source4/smbd/service_task.c b/source4/samba/service_task.c
similarity index 100%
rename from source4/smbd/service_task.c
rename to source4/samba/service_task.c

diff --git a/source4/smbd/service_task.h b/source4/samba/service_task.h
similarity index 100%
rename from source4/smbd/service_task.h
rename to source4/samba/service_task.h

diff --git a/source4/smbd/wscript_build b/source4/samba/wscript_build
similarity index 100%
rename from source4/smbd/wscript_build
rename to source4/samba/wscript_build

diff --git a/source4/smb_server/management.c b/source4/smb_server/management.c
index af993717ef7d5f7e7fd7b6d4519c668690b5a250..5cdfff0d80137cbca9a31b88625d2d1b0e66936a 100644 (file)
--- 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 37e8a61afb5b15cf778ae78f9c20f103d1eca4f7..2215ba18862605704a98491fa582ee640b3eeca5 100644 (file)
--- 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 04b69dd988300e5c5b4727a3ff370389298ede20..cd2451d2e9c35b3c40c444e12fe1778d27d9fcc2 100644 (file)
--- 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 8a05ecee56ff932d3a72f9856fe18499269b7faa..b96cdbd821bbe3cebad0a0af687156080d30c8df 100644 (file)
--- 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 41854a1f0f1bd307af8902ecd09d464bc3a17d8d..0f3171fb68e9853ff929a396040ed355ff616fff 100644 (file)
--- 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 c23b470e472e2319a01b8ca5e1d8e57078aff1aa..eb1874c4d510c68c7496943b955b2dc28860dc5f 100644 (file)
--- 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 13f139344120e4bf602d6e313645e225ddcb51e7..68cdd70feff8e4b45fa8eaaf204179819b223262 100644 (file)
--- 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 447095c50080a7233535a4c3b82200c15f1fafce..fc357ed73f921969c5b6b1d08645fadc62c93bf4 100644 (file)
--- 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 c433eb194bd16adcb5a69fcf03e69b93802980ee..048d7b46837fb1296892fa223bbc0d5722e07605 100644 (file)
--- 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 04241abcc39fa5047142479bbd3a5baebf4c3eac..c4109bfbc2fc07665be20af329769d42c31f8cd5 100644 (file)
--- 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 501aab671d7043fc887c9c52397714f593a7f1f9..a8c45608cae0dd472159cef9880459748e94d77f 100644 (file)
--- 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 b2d104329a16100058007de0740e442fea4d1320..0c564206a08fbb2137a26fa0f4cedcd09d545ac4 100644 (file)
--- 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 0b80f2fbd201422a4bfb0a9a883e4bceb89862dd..57810c08a9674c3935d38610656937d705a3867a 100644 (file)
--- 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 34c303c53b0d047ad6d9cca90171e1722de854ab..39bc0a5ff5f596452ab89a03cfda2d729d6bc0de 100644 (file)
--- 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"
 

diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 8c17d76cd3c6c93a0066a58e79af80ec23b05df2..32e0d074a06d08dac80ba2eaceb0388b3378664a 100644 (file)
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -28,7 +28,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/dcerpc_server_proto.h"
 #include "rpc_server/service_rpc.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "smb_server/smb_server.h"
 #include "lib/socket/netif.h"
 #include "ntvfs/ntvfs.h"

diff --git a/source4/winbind/winbindd.c b/source4/winbind/winbindd.c
index e68ddfb68e1216a2b29198be70118c35c1075a2e..a3d536901bd1d4509ff3c199bede5c0abe50bf9a 100644 (file)
--- a/source4/winbind/winbindd.c
+++ b/source4/winbind/winbindd.c
@@ -25,8 +25,8 @@
 #include "tevent.h"
 #include "system/filesys.h"
 #include "lib/param/param.h"
-#include "source4/smbd/service.h"
-#include "source4/smbd/process_model.h"
+#include "source4/samba/service.h"
+#include "source4/samba/process_model.h"
 #include "dynconfig.h"
 #include "nsswitch/winbind_client.h"
 

diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index bc8a820013235f9d0b29961c50cb6fd7246ed1f0..9e7bab395e31e598c3040a013746d84d2e396325 100644 (file)
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include <tevent.h>
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc_c.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"

diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c
index 9fc723fd31e01eccae7c0ce433a96d7f05c76de7..68fffa137fb010b3c3555e369c7611bf0dff580d 100644 (file)
--- a/source4/wrepl_server/wrepl_in_call.c
+++ b/source4/wrepl_server/wrepl_in_call.c
@@ -22,8 +22,8 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/tsocket/tsocket.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "libcli/composite/composite.h"

diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 5cbb086a8db3bf61c76d6af9645d24d256ff6fca..c68214dcbd248a5ef0ad72ca0735b1531f7360d5 100644 (file)
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -22,13 +22,13 @@
 #include "includes.h"
 #include "lib/socket/socket.h"
 #include "lib/stream/packet.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 "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
-#include "smbd/process_model.h"
+#include "samba/process_model.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
 #include "lib/tsocket/tsocket.h"

diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c
index 0e3f0a458ba714600bbe511bbdebb4f9965d55b0..98e8b638b7415dabb7e113cf81837ce2c30b0d05 100644 (file)
--- a/source4/wrepl_server/wrepl_out_helpers.c
+++ b/source4/wrepl_server/wrepl_out_helpers.c
@@ -22,8 +22,8 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
+#include "samba/service_task.h"
+#include "samba/service_stream.h"
 #include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "nbt_server/wins/winsdb.h"

diff --git a/source4/wrepl_server/wrepl_periodic.c b/source4/wrepl_server/wrepl_periodic.c
index aecf47357ea6870496beb0d925b63285fef85d06..8cbf6fb97a4172eb30d0446e9528466c3e86df79 100644 (file)
--- a/source4/wrepl_server/wrepl_periodic.c
+++ b/source4/wrepl_server/wrepl_periodic.c
@@ -21,8 +21,8 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 

diff --git a/source4/wrepl_server/wrepl_scavenging.c b/source4/wrepl_server/wrepl_scavenging.c
index d04064970c9f2f9a1e5f65ecba57e278f64aa4d0..05a02187b10cf6345a0b577d21de7eb7b11451c1 100644 (file)
--- a/source4/wrepl_server/wrepl_scavenging.c
+++ b/source4/wrepl_server/wrepl_scavenging.c
@@ -26,7 +26,7 @@
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "system/time.h"
-#include "smbd/service_task.h"
+#include "samba/service_task.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc_c.h"
 #include "librpc/gen_ndr/ndr_nbt.h"

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index d1e2869b009020728c9ac0508e4c942bc41aacd8..aa408edc79900bf6b31b14396515c009a1c1f2a1 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -21,8 +21,8 @@
 
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
-#include "smbd/service_task.h"
-#include "smbd/service.h"
+#include "samba/service_task.h"
+#include "samba/service.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"

diff --git a/wscript_build b/wscript_build
index 850ed71c1c1feb681351546c2e4764ec4d974f9d..7ac64b7af832c873e695c49ad2a156da7f29a1ee 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -60,7 +60,7 @@ bld.RECURSE('python')
 bld.RECURSE('source4/param')
 bld.RECURSE('source4/librpc')
 bld.RECURSE('source4/dsdb')
-bld.RECURSE('source4/smbd')
+bld.RECURSE('source4/samba')
 bld.RECURSE('source4/cluster')
 bld.RECURSE('source4/libnet')
 bld.RECURSE('source4/auth')