smbd: Avoid casts in do_unlock()

[metze/samba/wip.git] / source3 / locking / locking.c

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index f46391faf458b6418ff266f1f12e718383d00a91..8deb5279fa4dd4bba2cdcfab9a26bc1b93470942 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -316,9 +316,12 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
                return NT_STATUS_OK;
        }
 
-       DEBUG(10, ("do_unlock: unlock start=%ju len=%ju requested for %s file "
-                  "%s\n", (uintmax_t)offset, (uintmax_t)count,
-                  fsp_fnum_dbg(fsp), fsp_str_dbg(fsp)));
+       DBG_DEBUG("unlock start=%"PRIu64" len=%"PRIu64" requested for %s file "
+                 "%s\n",
+                 offset,
+                 count,
+                 fsp_fnum_dbg(fsp),
+                 fsp_str_dbg(fsp));
 
        br_lck = brl_get_locks(talloc_tos(), fsp);
        if (!br_lck) {
@@ -507,8 +510,6 @@ bool rename_share_filename(struct messaging_context *msg_ctx,
                .base_name = smb_fname_dst->base_name,
                .stream_name = smb_fname_dst->stream_name,
        };
-       DATA_BLOB blob;
-       enum ndr_err_code ndr_err;
        uint32_t i;
        struct server_id self_pid = messaging_server_id(msg_ctx);
        bool ok;
@@ -536,24 +537,11 @@ bool rename_share_filename(struct messaging_context *msg_ctx,
        }
        d->modified = True;
 
-       ndr_err = ndr_push_struct_blob(
-               &blob,
-               talloc_tos(),
-               &msg,
-               (ndr_push_flags_fn_t)ndr_push_file_rename_message);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               DBG_DEBUG("ndr_push_file_rename_message failed: %s\n",
-                         ndr_errstr(ndr_err));
-               return false;
-       }
-       if (DEBUGLVL(10)) {
-               NDR_PRINT_DEBUG(file_rename_message, &msg);
-       }
-
        /* Send the messages. */
        for (i=0; i<d->num_share_modes; i++) {
                struct share_mode_entry *se = &d->share_modes[i];
-               struct server_id_buf tmp;
+               DATA_BLOB blob;
+               enum ndr_err_code ndr_err;
 
                if (!is_valid_share_mode_entry(se)) {
                        continue;
@@ -576,13 +564,29 @@ bool rename_share_filename(struct messaging_context *msg_ctx,
                        continue;
                }
 
-               DBG_DEBUG("sending rename message to %s\n",
-                         server_id_str_buf(se->pid, &tmp));
+               msg.share_file_id = se->share_file_id;
+
+               ndr_err = ndr_push_struct_blob(
+                       &blob,
+                       talloc_tos(),
+                       &msg,
+                       (ndr_push_flags_fn_t)ndr_push_file_rename_message);
+               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                       DBG_DEBUG("ndr_push_file_rename_message failed: %s\n",
+                                 ndr_errstr(ndr_err));
+                       return false;
+               }
+               if (DEBUGLEVEL >= 10) {
+                       struct server_id_buf tmp;
+                       DBG_DEBUG("sending rename message to %s\n",
+                                 server_id_str_buf(se->pid, &tmp));
+                       NDR_PRINT_DEBUG(file_rename_message, &msg);
+               }
 
                messaging_send(msg_ctx, se->pid, MSG_SMB_FILE_RENAME, &blob);
-       }
 
-       TALLOC_FREE(blob.data);
+               TALLOC_FREE(blob.data);
+       }
 
        ok = share_mode_forall_leases(lck, rename_lease_fn, NULL);
        if (!ok) {