[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  78208d4fe47 ctdb: Remove an unnecessary cast
       via  8eaba9dbc5b smbd: Fix a DBG message
      from  072cb98e432 smbd: Avoid a ZERO_STRUCT() with direct struct initialization

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 78208d4fe47a0c634a6bd7c04f3d01f0020ee88b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 29 15:33:56 2024 +0100

    ctdb: Remove an unnecessary cast
    
    nl->srvid is uint64_t, as is the srvid parameter of ctdb_daemon_send_message()
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Mar 13 08:43:16 UTC 2024 on atb-devel-224

commit 8eaba9dbc5bd4befd6d1a651cf0666da0ff36265
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 20 12:50:36 2024 +0100

    smbd: Fix a DBG message
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/server/ctdb_daemon.c      | 5 ++++-
 source3/smbd/notifyd/notifyd.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index eb9d63454de..0a53770a6bf 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -2016,7 +2016,10 @@ static int ctdb_client_notify_destructor(struct ctdb_client_notify_list *nl)
 
 	DEBUG(DEBUG_ERR,("Sending client notify message for srvid:%llu\n", (unsigned long long)nl->srvid));
 
-	ret = ctdb_daemon_send_message(nl->ctdb, CTDB_BROADCAST_CONNECTED, (unsigned long long)nl->srvid, nl->data);
+	ret = ctdb_daemon_send_message(nl->ctdb,
+				       CTDB_BROADCAST_CONNECTED,
+				       nl->srvid,
+				       nl->data);
 	if (ret != 0) {
 		DEBUG(DEBUG_ERR,("Failed to send client notify message\n"));
 	}
diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c
index ca303bd4d51..4af62a9a1f9 100644
--- a/source3/smbd/notifyd/notifyd.c
+++ b/source3/smbd/notifyd/notifyd.c
@@ -228,7 +228,7 @@ struct tevent_req *notifyd_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 
 	ret = server_id_db_set_exclusive(names_db, "notify-daemon");
 	if (ret != 0) {
-		DBG_DEBUG("server_id_db_add failed: %s\n",
+		DBG_DEBUG("server_id_db_set_exclusive() failed: %s\n",
 			  strerror(ret));
 		tevent_req_error(req, ret);
 		goto deregister_get_db;


-- 
Samba Shared Repository