[SCM] Samba Shared Repository - branch master updated
Ralph Böhme
slow at samba.org
Fri Nov 27 10:08:06 UTC 2020
The branch, master has been updated
via 4142bde7e52 s4: rename source4/smbd/ to source4/samba/
from 8ad82ae6615 samba-tool: Give better error information when the 'domain backup restore' fails with a duplicate SID
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4142bde7e524e9d5a491b2ff1afa4990e2c89a10
Author: Ralph Boehme <slow at samba.org>
Date: Fri Nov 20 15:27:17 2020 +0100
s4: rename source4/smbd/ to source4/samba/
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Fri Nov 27 10:07:18 UTC 2020 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
file_server/file_server.c | 4 ++--
source4/cldap_server/cldap_server.c | 4 ++--
source4/cldap_server/rootdse.c | 2 +-
source4/dns_server/dns_query.c | 2 +-
source4/dns_server/dns_server.c | 8 ++++----
source4/dns_server/dns_update.c | 2 +-
source4/dsdb/dns/dns_update.c | 2 +-
source4/dsdb/kcc/kcc_connection.c | 2 +-
source4/dsdb/kcc/kcc_drs_replica_info.c | 2 +-
source4/dsdb/kcc/kcc_periodic.c | 2 +-
source4/dsdb/kcc/kcc_service.c | 2 +-
source4/dsdb/repl/drepl_extended.c | 2 +-
source4/dsdb/repl/drepl_fsmo.c | 2 +-
source4/dsdb/repl/drepl_notify.c | 2 +-
source4/dsdb/repl/drepl_out_helpers.c | 2 +-
source4/dsdb/repl/drepl_out_pull.c | 2 +-
source4/dsdb/repl/drepl_partitions.c | 2 +-
source4/dsdb/repl/drepl_periodic.c | 2 +-
source4/dsdb/repl/drepl_replica.c | 2 +-
source4/dsdb/repl/drepl_ridalloc.c | 2 +-
source4/dsdb/repl/drepl_secret.c | 2 +-
source4/dsdb/repl/drepl_service.c | 2 +-
source4/dsdb/samdb/ldb_modules/netlogon.c | 2 +-
source4/echo_server/echo_server.c | 2 +-
source4/kdc/kdc-heimdal.c | 2 +-
source4/kdc/kdc-proxy.c | 2 +-
source4/kdc/kdc-server.c | 2 +-
source4/kdc/kdc-service-mit.c | 4 ++--
source4/kdc/kpasswd-service-heimdal.c | 2 +-
source4/kdc/kpasswd-service-mit.c | 2 +-
source4/kdc/kpasswd-service.c | 2 +-
source4/kdc/mit_kdc_irpc.c | 2 +-
source4/ldap_server/ldap_backend.c | 2 +-
source4/ldap_server/ldap_bind.c | 2 +-
source4/ldap_server/ldap_extended.c | 2 +-
source4/ldap_server/ldap_server.c | 8 ++++----
source4/nbt_server/dgram/netlogon.c | 2 +-
source4/nbt_server/dgram/ntlogon.c | 2 +-
source4/nbt_server/dgram/request.c | 2 +-
source4/nbt_server/interfaces.c | 2 +-
source4/nbt_server/irpc.c | 4 ++--
source4/nbt_server/nbt_server.c | 4 ++--
source4/nbt_server/packet.c | 2 +-
source4/nbt_server/query.c | 2 +-
source4/nbt_server/register.c | 2 +-
source4/nbt_server/wins/wins_dns_proxy.c | 2 +-
source4/nbt_server/wins/winsclient.c | 2 +-
source4/nbt_server/wins/winsserver.c | 2 +-
source4/nbt_server/wins/winswack.c | 2 +-
source4/ntp_signd/ntp_signd.c | 8 ++++----
source4/ntvfs/posix/pvfs_search.c | 2 +-
source4/ntvfs/posix/pvfs_wait.c | 2 +-
source4/rpc_server/dcerpc_server.c | 4 ++--
source4/rpc_server/service_rpc.c | 2 +-
source4/{smbd => samba}/process_model.c | 2 +-
source4/{smbd => samba}/process_model.h | 4 ++--
source4/{smbd => samba}/process_prefork.c | 2 +-
source4/{smbd => samba}/process_single.c | 2 +-
source4/{smbd => samba}/process_standard.c | 2 +-
source4/{smbd => samba}/server.c | 2 +-
source4/{smbd => samba}/service.c | 2 +-
source4/{smbd => samba}/service.h | 6 +++---
source4/{smbd => samba}/service_named_pipe.c | 2 +-
source4/{smbd => samba}/service_stream.c | 0
source4/{smbd => samba}/service_stream.h | 0
source4/{smbd => samba}/service_task.c | 0
source4/{smbd => samba}/service_task.h | 0
source4/{smbd => samba}/wscript_build | 0
source4/smb_server/management.c | 2 +-
source4/smb_server/service_smb.c | 6 +++---
source4/smb_server/smb/negprot.c | 2 +-
source4/smb_server/smb/receive.c | 2 +-
source4/smb_server/smb/request.c | 2 +-
source4/smb_server/smb/service.c | 2 +-
source4/smb_server/smb/sesssetup.c | 2 +-
source4/smb_server/smb/trans2.c | 2 +-
source4/smb_server/smb2/negprot.c | 2 +-
source4/smb_server/smb2/receive.c | 2 +-
source4/smb_server/smb2/sesssetup.c | 2 +-
source4/smb_server/smb2/tcon.c | 2 +-
source4/smb_server/smb_server.c | 6 +++---
source4/smb_server/tcon.c | 2 +-
source4/torture/rpc/spoolss_notify.c | 2 +-
source4/winbind/winbindd.c | 4 ++--
source4/wrepl_server/wrepl_apply_records.c | 2 +-
source4/wrepl_server/wrepl_in_call.c | 4 ++--
source4/wrepl_server/wrepl_in_connection.c | 8 ++++----
source4/wrepl_server/wrepl_out_helpers.c | 4 ++--
source4/wrepl_server/wrepl_periodic.c | 4 ++--
source4/wrepl_server/wrepl_scavenging.c | 2 +-
source4/wrepl_server/wrepl_server.c | 4 ++--
wscript_build | 2 +-
92 files changed, 117 insertions(+), 117 deletions(-)
rename source4/{smbd => samba}/process_model.c (99%)
rename source4/{smbd => samba}/process_model.h (97%)
rename source4/{smbd => samba}/process_prefork.c (99%)
rename source4/{smbd => samba}/process_single.c (99%)
rename source4/{smbd => samba}/process_standard.c (99%)
rename source4/{smbd => samba}/server.c (99%)
rename source4/{smbd => samba}/service.c (98%)
rename source4/{smbd => samba}/service.h (95%)
rename source4/{smbd => samba}/service_named_pipe.c (99%)
rename source4/{smbd => samba}/service_stream.c (100%)
rename source4/{smbd => samba}/service_stream.h (100%)
rename source4/{smbd => samba}/service_task.c (100%)
rename source4/{smbd => samba}/service_task.h (100%)
rename source4/{smbd => samba}/wscript_build (100%)
Changeset truncated at 500 lines:
diff --git a/file_server/file_server.c b/file_server/file_server.c
index 4c216695a1f..69aabbe3ca1 100644
--- 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 51183260833..3a8b3be7a63 100644
--- 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 a5e1c6b5c4e..89f0a66b0ad 100644
--- 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 762bcca6fb6..181beda219b 100644
--- 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 43ea88158ce..f9b14ed49db 100644
--- 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 f9866611119..b6d39e4c034 100644
--- 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 4a81d06b097..dd94564c996 100644
--- 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 6a20dea1d14..f387dfcb0fe 100644
--- 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 3f16de8cb6d..edd0710c4a2 100644
--- 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 c6ee6d89dfd..c37b8587852 100644
--- 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 13c78976e3a..066cc070c30 100644
--- 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 e2f85893ae8..8b5bb6faf63 100644
--- 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 be707a9c238..3c3cbad8f21 100644
--- 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 a811f97e274..20be3b53dd0 100644
--- 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 afe25d82271..401d2bf2728 100644
--- 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 ea553b4b6d2..fe9bd60c3ef 100644
--- 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 57b82131225..cc32d5904da 100644
--- 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 d4ed1f013d1..4cdc8cba220 100644
--- 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 b79b2826eda..05d068306fd 100644
--- 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 162df198c20..6794d4beb6c 100644
--- 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 70492f58983..47a8ca9c65e 100644
--- 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 ee877f2654e..02ece26842e 100644
--- 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 e5ca65f3b36..66ab70b6f54 100644
--- 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 c81fc140a0a..54ab719cfaf 100644
--- 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 ee4e1387def..a3c357ca1a6 100644
--- 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 0f84906338f..64160b3434d 100644
--- 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 00b5c745fec..de0ae8d1a72 100644
--- 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 dd6902f083d..5d4180aa7cc 100644
--- 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 12c7402bf3f..c804852c3a7 100644
--- 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 9a014c058fe..2117c1c1696 100644
--- 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 b36cf402228..8f1679e4a28 100644
--- 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 e0021710c9f..33eb74b37f5 100644
--- 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 915d9b94f9b..e19f82cf5df 100644
--- 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 54493d040ff..b60dc71d7e7 100644
--- 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 2d4a5345460..e6bf16384f0 100644
--- 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 c2d53eacd3f..20442ecd9e5 100644
--- 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 e2ee1000d7b..e9d89e52dea 100644
--- 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
--
Samba Shared Repository
More information about the samba-cvs
mailing list