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

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"
 

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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>

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>

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>

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"

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"

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"
 

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"
 

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>

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"

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 */

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"

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"

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"

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"

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"

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"

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"

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"

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>

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"

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 {

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>

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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 

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"

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;

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"

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"
 

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 */

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"
 

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,

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"
 

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

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"

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"
 

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"

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"

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
 

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__ */

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"

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"

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"

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"
 

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"

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"
 

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"
 

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"

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"

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)

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"

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)

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"
 
 /*

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"

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"
 

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"

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"
 

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"

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"

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"

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"

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"
 

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"

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"

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')