lib: Add lib/util/server_id.h

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

diff --git a/lib/util/debug_s3.c b/lib/util/debug_s3.c
index b05d42255012494960d2a0f6b49a368c084e0c7e..99ba2e7188d593f47697b36c5727e90a42319bd2 100644 (file)
--- a/lib/util/debug_s3.c
+++ b/lib/util/debug_s3.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 #include "lib/util/memory.h"

diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index c19e246bcd451240e71cb23fe814d2fdd3a82661..5dcaf947b38e773bb7de0a7111997cdca3d6714b 100644 (file)
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -688,36 +688,6 @@ char *data_path(TALLOC_CTX *mem_ctx, const char *name);
  **/
 const char *shlib_ext(void);
 
-struct server_id;
-
-struct server_id_buf { char buf[48]; }; /* probably a bit too large ... */
-char *server_id_str_buf(struct server_id id, struct server_id_buf *dst);
-size_t server_id_str_buf_unique(struct server_id id, char *buf, size_t buflen);
-
-bool server_id_same_process(const struct server_id *p1,
-                           const struct server_id *p2);
-bool server_id_equal(const struct server_id *p1, const struct server_id *p2);
-struct server_id server_id_from_string(uint32_t local_vnn,
-                                      const char *pid_string);
-
-/**
- * Set the serverid to the special value that represents a disconnected
- * client for (e.g.) durable handles.
- */
-void server_id_set_disconnected(struct server_id *id);
-
-/**
- * check whether a serverid is the special placeholder for
- * a disconnected client
- */
-bool server_id_is_disconnected(const struct server_id *id);
-
-#define SERVER_ID_BUF_LENGTH 24
-void server_id_put(uint8_t buf[SERVER_ID_BUF_LENGTH],
-                  const struct server_id id);
-void server_id_get(struct server_id *id,
-                  const uint8_t buf[SERVER_ID_BUF_LENGTH]);
-
 /*
  * Samba code should use samba_tevent_context_init() instead of
  * tevent_context_init() in order to get the debug output.

diff --git a/lib/util/server_id.c b/lib/util/server_id.c
index 77c5ee1c09781f86a7b26e3b1aa88bd88d2e7a1a..f8c9a53062c979317dba0f605c72b9b3d986e5aa 100644 (file)
--- a/lib/util/server_id.c
+++ b/lib/util/server_id.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "librpc/gen_ndr/server_id.h"
 
 bool server_id_same_process(const struct server_id *p1,

diff --git a/lib/util/server_id.h b/lib/util/server_id.h
new file mode 100644 (file)
index 0000000..6dda86c
--- /dev/null
+++ b/lib/util/server_id.h
@@ -0,0 +1,56 @@
+/*
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Andrew Bartlett 2011
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __LIB_UTIL_SERVER_ID_H__
+#define __LIB_UTIL_SERVER_ID_H__
+
+#include "replace.h"
+
+struct server_id;
+
+struct server_id_buf { char buf[48]; }; /* probably a bit too large ... */
+
+bool server_id_same_process(const struct server_id *p1,
+                           const struct server_id *p2);
+bool server_id_equal(const struct server_id *p1, const struct server_id *p2);
+char *server_id_str_buf(struct server_id id, struct server_id_buf *dst);
+size_t server_id_str_buf_unique(struct server_id id, char *buf, size_t buflen);
+
+struct server_id server_id_from_string(uint32_t local_vnn,
+                                      const char *pid_string);
+
+/**
+ * Set the serverid to the special value that represents a disconnected
+ * client for (e.g.) durable handles.
+ */
+void server_id_set_disconnected(struct server_id *id);
+
+/**
+ * check whether a serverid is the special placeholder for
+ * a disconnected client
+ */
+bool server_id_is_disconnected(const struct server_id *id);
+
+#define SERVER_ID_BUF_LENGTH 24
+void server_id_put(uint8_t buf[SERVER_ID_BUF_LENGTH],
+                  const struct server_id id);
+void server_id_get(struct server_id *id,
+                  const uint8_t buf[SERVER_ID_BUF_LENGTH]);
+
+#endif

diff --git a/lib/util/server_id_db.c b/lib/util/server_id_db.c
index 1e65ce25426789f71cd496876cff3fad153119bf..e0b84768ffc0bf57526af1e46f61c4b1249b3403 100644 (file)
--- a/lib/util/server_id_db.c
+++ b/lib/util/server_id_db.c
@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "lib/util/server_id_db.h"
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/strv.h"

diff --git a/source3/lib/dbwrap/dbwrap_watch.c b/source3/lib/dbwrap/dbwrap_watch.c
index a44f6f131f2ac6c6420b0048db4358aa4558da5a..842ab861455d7b1a6f35a361ee7a64a9415d84db 100644 (file)
--- 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 f9549789bee7d35a59346d39a6f5ef7ef7d16f64..18157968f51a975bdcd36d7566bc96bf4b9b6c93 100644 (file)
--- 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 533e8694612d37d7c63235d4b6a229c43acebdef..d7ad49d7c309c5a07e02b979ce7182994c6d2b91 100644 (file)
--- 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 bee268500db79461e40a8c74c3bd4217441f131d..a32a80d224035c3b2ab1a01718b983e8da3a7c61 100644 (file)
--- 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 7c11ecf2f8450be5a7d10bc53a3a4d3a2da53162..d712dfe401ddae778b62d4d12acbb941601b7827 100644 (file)
--- 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 6c6d8ed239af9a16768b8f5964341cb43ebff0e4..e73af24213959248764586aa72835e52ab19e2d3 100644 (file)
--- 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 f2c64001d7407bf92c1be0d69c50b310013474a1..7cc8b57cbc027ce9c88d5d573e2f87caed9ac416 100644 (file)
--- 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 85cb9b396876f310756d9b5fec22079c0ac2cffc..565d71cbf6c202145779a60f1bbfe3c24ce61f8d 100644 (file)
--- 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 70096d627f02ccb308c1ad3c8ac344dab24a3be9..33efe37810ba5524e950d4ca01383b5ba3abd7b5 100644 (file)
--- 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 5a9746094baefbc34ed31c51cac1bb19d645533f..e540ab4dcd8e4aef2864cbf33c2f97a4d88d2ee2 100644 (file)
--- 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 432637a3dfe228766ea6725791296857195c31a0..ff794282114af0186121f2d50c933495ec3fb51f 100644 (file)
--- 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 f738323ef7c9c42f886ede1af24f228f9266d7d0..0f4028c10309295f6e8ad5cc5782044907f8cd28 100644 (file)
--- 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 17172d27fe40920d7562bd87dd717aecca22ce32..513ef17c90303a48f4beed62fa3ea67ac788395a 100644 (file)
--- 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 bc468c7e55de6d5175574191c5230af7ce696678..095feecf204949ec0571eee7d9e67b14afe74f2e 100644 (file)
--- 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 f39a365242c963d0443109084b2a0a15b000d33e..602a96e1fe56bc874f738893685046a931b101ce 100644 (file)
--- 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 20b286492e810b851afa2ad9f8b18f95472ed284..3787df74bfd0b67a74f6a8a024b63430d90739de 100644 (file)
--- 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 70f52cd7c839dd91fcb15edcf0a201106a94084b..33a875a37320f86a6aa9922825b36cfc22ca3e5b 100644 (file)
--- 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 42db659d4022030042e93d3bfe126aef5d6cb0a6..404a259b57f6f25c39cc4f2cd1e630a4a004801a 100644 (file)
--- 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 ff87d9ea4498327be2cfc921a8bda596b0cfeed3..8e29f0db4b0983846b142f0f6c03eb631eae5ab0 100644 (file)
--- 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 9f58f62fc06d1b6ef4f8c52c0416c0082dd4784f..9b479a621e3b146cfed307751b98e95812e5abf0 100644 (file)
--- 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 3cbd08971fe0ce2316a5c498981bafe3e97aa24e..494e188308be0ceccb989873b9cff09c54a4dcf8 100644 (file)
--- 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 c058eac33630af119c8d931924df2a1df1d7366f..8ec60937155dd3538baa2c7f6e4e80de173e52da 100644 (file)
--- 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 ca04ae75ec77da172221b108e6c7387ea6bcb91b..30cf25276bed163d798249aaa580734b39a6d2c4 100644 (file)
--- 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 fc7d4345067154e9856c95492a29b08b47e1ea9d..17a730775723041ee29fec26eb7a58717a569632 100644 (file)
--- 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 381ce407c70836bcba31e422a4e70a5a9323125b..f84d2a94ce1d60900126e992359e7cf994c3055a 100644 (file)
--- 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 ddd03f610906598e3ff794fa7fa0a7e05f11e046..82c880adc0b3768136f70d352ba15ed260c8832e 100644 (file)
--- 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 158fe3c82fb0eb16d8ef5f7f30ad9daf743ba937..3c3dda3c779b178849a1405c3cd2bdfe576b5cc2 100644 (file)
--- 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 c15f24da9e113ca4a946c81a068b9a3d05d4c7fc..e718018be98e5ae1e8f13d4c6b0821392dfd87fd 100644 (file)
--- 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 5ac832a49a782693d04903b0d728c2499668d5fe..d786f5a4ecb3e6ad92c5db9277a834cb24ef2fa1 100644 (file)
--- 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 7138bcb2add75443a8ee238448e97dae54d23658..eddfb0ee5a8fa77a1dd88ccfe0d3c0c7aecc793f 100644 (file)
--- 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 f228c91f536f4be8c1d2f88bc835cbba786c1115..942f7a4902411451b6a71c34ea756157c7e7a28d 100644 (file)
--- 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 9dbb1a45847401e3dce97d8a2c947dac8a685859..0d658a0c36e0eb632a925fb4b1f2a204a802e461 100644 (file)
--- 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 8c0f636957a4103167bf2f67715714d7ac920f3b..4c4bfcb4e5b527c3626c1d4fcbb44fe764b5c853 100644 (file)
--- 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 f185663ec1719da76bbaa7bb87a6c3e127ad8501..abc0d26df53b191be0c0f1a348469629720ef384 100644 (file)
--- 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"

diff --git a/source4/dsdb/samdb/ldb_modules/ridalloc.c b/source4/dsdb/samdb/ldb_modules/ridalloc.c
index d3463e6e7a04a1d27632547b46bd3a736e250957..730272a50ce889c39957c4a6d2ddb440755cdd17 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/ridalloc.c
+++ b/source4/dsdb/samdb/ldb_modules/ridalloc.c
@@ -29,6 +29,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
+#include "lib/util/server_id.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "lib/messaging/irpc.h"

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 22d3ad8760285071ec150bb59293a545b234917d..84df9345d80f3b24608ab1037c670ec4da7e5227 100644 (file)
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
+#include "lib/util/server_id.h"
 #include "system/filesys.h"
 #include "messaging/messaging.h"
 #include "../lib/util/dlinklist.h"

diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index 94bd5ce7ad40c2dda4b5b9f8bf2aebaa62935a8c..8a05ecee56ff932d3a72f9856fe18499269b7faa 100644 (file)
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "lib/util/server_id.h"
 #include "smbd/service_stream.h"
 #include "smb_server/smb_server.h"
 #include "system/filesys.h"

diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index f0a379acf6a68be6f9296b0af51ecb1507dbfb5f..22c885bbe2b9405a25da671485749cc35f51da3e 100644 (file)
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include <tevent.h>
 #include "process_model.h"
+#include "lib/util/server_id.h"
 #include "lib/messaging/irpc.h"
 #include "cluster/cluster.h"
 #include "param/param.h"