s3:smbd: remove brl_register_msgs()

metze

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index efc58c38913e0b4e565b58496d9d53b173a47883..33c92438cd3470505bed163d032886a12a693e3f 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1926,11 +1926,11 @@ static int compare_procids(const void *p1, const void *p2)
  * array, then qsort that array and only send to non-dupes.
  */
 
-static void brl_revalidate(struct messaging_context *msg_ctx,
-                          void *private_data,
-                          uint32_t msg_type,
-                          struct server_id server_id,
-                          DATA_BLOB *data)
+void brl_revalidate(struct messaging_context *msg_ctx,
+                   void *private_data,
+                   uint32_t msg_type,
+                   struct server_id server_id,
+                   DATA_BLOB *data)
 {
        struct brl_revalidate_state *state;
        uint32 i;
@@ -1973,9 +1973,3 @@ static void brl_revalidate(struct messaging_context *msg_ctx,
        TALLOC_FREE(state);
        return;
 }
-
-void brl_register_msgs(struct messaging_context *msg_ctx)
-{
-       messaging_register(msg_ctx, NULL, MSG_SMB_BRL_VALIDATE,
-                          brl_revalidate);
-}

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 5be8acc920c64b27c62659cf991c49a3faad3cb9..2c01634d310e11d2e3f5c5c9ae7b1afba383baf5 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -90,7 +90,11 @@ int brl_forall(void (*fn)(struct file_id id, struct server_id pid,
 struct byte_range_lock *brl_get_locks(TALLOC_CTX *mem_ctx,
                                        files_struct *fsp);
 struct byte_range_lock *brl_get_locks_readonly(files_struct *fsp);
-void brl_register_msgs(struct messaging_context *msg_ctx);
+void brl_revalidate(struct messaging_context *msg_ctx,
+                   void *private_data,
+                   uint32_t msg_type,
+                   struct server_id server_id,
+                   DATA_BLOB *data);
 
 /* The following definitions come from locking/locking.c  */
 

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index f351b995018de95154dd79172d565662e5054acb..07d2b3ebff4b455e1cfe054adcd9fdd60daf1fc6 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -765,7 +765,8 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
        messaging_register(msg_ctx, NULL, MSG_DEBUG, smbd_msg_debug);
        messaging_register(msg_ctx, ev_ctx, MSG_PRINTER_PCAP,
                           smb_pcap_updated);
-       brl_register_msgs(msg_ctx);
+       messaging_register(msg_ctx, NULL, MSG_SMB_BRL_VALIDATE,
+                          brl_revalidate);
 
        msg_idmap_register_msg(msg_ctx);