lib: Add lib/util/server_id.h

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

34 files changed, 34 insertions, 1 deletions

diff --git a/source3/lib/dbwrap/dbwrap_watch.c b/source3/lib/dbwrap/dbwrap_watch.c
index a44f6f131f2..842ab861455 100644
--- a/source3/lib/dbwrap/dbwrap_watch.c
+++ b/source3/lib/dbwrap/dbwrap_watch.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap_watch.h"
 #include "dbwrap_open.h"
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index f9549789bee..18157968f51 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "dbwrap/dbwrap_watch.h"
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 533e8694612..d7ad49d7c30 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -46,6 +46,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "dbwrap/dbwrap.h"
 #include "serverid.h"
 #include "messages.h"
diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index bee268500db..a32a80d2240 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "messages.h"
 #include "util_tdb.h"
 #include "lib/util/iov_buf.h"
diff --git a/source3/lib/messages_util.c b/source3/lib/messages_util.c
index 7c11ecf2f84..d712dfe401d 100644
--- a/source3/lib/messages_util.c
+++ b/source3/lib/messages_util.c
@@ -18,6 +18,7 @@
  */
 
 #include "replace.h"
+#include "lib/util/server_id.h"
 #include "lib/util/samba_util.h"
 #include "librpc/gen_ndr/server_id.h"
 #include "lib/util/byteorder.h"
diff --git a/source3/lib/server_id_db_util.c b/source3/lib/server_id_db_util.c
index 6c6d8ed239a..e73af242139 100644
--- a/source3/lib/server_id_db_util.c
+++ b/source3/lib/server_id_db_util.c
@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "server_id_db_util.h"
+#include "lib/util/server_id.h"
 #include "serverid.h"
 #include "lib/util/samba_util.h"
 
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index f2c64001d74..7cc8b57cbc0 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "serverid.h"
 #include "util_tdb.h"
 #include "dbwrap/dbwrap.h"
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 85cb9b39687..565d71cbf6c 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "system/passwd.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "util_tdb.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/util_pw.h"
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 70096d627f0..33efe37810b 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 5a9746094ba..e540ab4dcd8 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -37,6 +37,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 432637a3dfe..ff794282114 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_rbt.h"
diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index f738323ef7c..0f4028c1030 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -37,6 +37,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 17172d27fe4..513ef17c903 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "lib/util/server_id.h"
 #include "ntdomain.h"
 #include "../librpc/gen_ndr/srv_srvsvc.h"
 #include "../libcli/security/security.h"
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index bc468c7e55d..095feecf204 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "printing.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
diff --git a/source3/smbd/durable.c b/source3/smbd/durable.c
index f39a365242c..602a96e1fe5 100644
--- a/source3/smbd/durable.c
+++ b/source3/smbd/durable.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "libcli/security/security.h"
diff --git a/source3/smbd/notify_msg.c b/source3/smbd/notify_msg.c
index 20b286492e8..3787df74bfd 100644
--- a/source3/smbd/notify_msg.c
+++ b/source3/smbd/notify_msg.c
@@ -22,6 +22,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "lib/dbwrap/dbwrap.h"
 #include "lib/dbwrap/dbwrap_rbt.h"
+#include "lib/util/server_id.h"
 #include "messages.h"
 #include "proto.h"
 #include "globals.h"
diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c
index 70f52cd7c83..33a875a3732 100644
--- a/source3/smbd/notifyd/notifyd.c
+++ b/source3/smbd/notifyd/notifyd.c
@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include <tevent.h>
+#include "lib/util/server_id.h"
 #include "lib/util/data_blob.h"
 #include "librpc/gen_ndr/notify.h"
 #include "librpc/gen_ndr/messaging.h"
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 42db659d402..404a259b57f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "printing.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index ff87d9ea449..8e29f0db4b0 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -21,6 +21,7 @@
 
 #define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "messages.h"
diff --git a/source3/smbd/scavenger.c b/source3/smbd/scavenger.c
index 9f58f62fc06..9b479a621e3 100644
--- a/source3/smbd/scavenger.c
+++ b/source3/smbd/scavenger.c
@@ -19,12 +19,12 @@
 */
 
 #include "includes.h"
-
 #include "messages.h"
 #include "serverid.h"
 #include "smbd/globals.h"
 #include "smbd/scavenger.h"
 #include "locking/proto.h"
+#include "lib/util/server_id.h"
 #include "lib/util/util_process.h"
 #include "lib/util/sys_rw_data.h"
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 3cbd08971fe..494e188308b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "popt_common.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index c058eac3363..8ec60937155 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "../lib/tsocket/tsocket.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "auth.h"
diff --git a/source3/smbd/smbXsrv_client.c b/source3/smbd/smbXsrv_client.c
index ca04ae75ec7..30cf25276be 100644
--- a/source3/smbd/smbXsrv_client.c
+++ b/source3/smbd/smbXsrv_client.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include <tevent.h>
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index fc7d4345067..17a73077572 100644
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c
index 381ce407c70..f84d2a94ce1 100644
--- a/source3/smbd/smbXsrv_session.c
+++ b/source3/smbd/smbXsrv_session.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include <tevent.h>
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
diff --git a/source3/smbd/smbXsrv_tcon.c b/source3/smbd/smbXsrv_tcon.c
index ddd03f61090..82c880adc0b 100644
--- a/source3/smbd/smbXsrv_tcon.c
+++ b/source3/smbd/smbXsrv_tcon.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
diff --git a/source3/torture/msg_sink.c b/source3/torture/msg_sink.c
index 158fe3c82fb..3c3dda3c779 100644
--- a/source3/torture/msg_sink.c
+++ b/source3/torture/msg_sink.c
@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "messages.h"
 #include "lib/util/tevent_unix.h"
 #include <stdio.h>
diff --git a/source3/torture/msg_source.c b/source3/torture/msg_source.c
index c15f24da9e1..e718018be98 100644
--- a/source3/torture/msg_source.c
+++ b/source3/torture/msg_source.c
@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "messages.h"
 #include "lib/util/tevent_unix.h"
 #include <stdio.h>
diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c
index 5ac832a49a7..d786f5a4ecb 100644
--- a/source3/utils/net_g_lock.c
+++ b/source3/utils/net_g_lock.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "net.h"
+#include "lib/util/server_id.h"
 #include "g_lock.h"
 #include "messages.h"
 
diff --git a/source3/utils/net_notify.c b/source3/utils/net_notify.c
index 7138bcb2add..eddfb0ee5a8 100644
--- a/source3/utils/net_notify.c
+++ b/source3/utils/net_notify.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "lib/util/server_id.h"
 #include "lib/util/tevent_unix.h"
 #include "lib/util/server_id_db.h"
 #include "messages.h"
diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c
index f228c91f536..942f7a49024 100644
--- a/source3/utils/net_serverid.c
+++ b/source3/utils/net_serverid.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "lib/util/server_id.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "serverid.h"
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 9dbb1a45847..0d658a0c36e 100644
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -17,6 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "utils/net.h"
 #include "session.h"
 #include "messages.h"
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 8c0f636957a..4c4bfcb4e5b 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "popt_common.h"
 #include "librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"
diff --git a/source3/utils/status.c b/source3/utils/status.c
index f185663ec17..abc0d26df53 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -31,6 +31,7 @@
  */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "smbd/globals.h"
 #include "system/filesys.h"
 #include "popt_common.h"