smbd: Modernize a few DEBUGs

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index c217259f26bdbb5abc684cce380392d40b3e569b..85c6aceaf361150a73a8c78832df4e3c4f300a60 100644 (file)
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -6488,8 +6488,9 @@ void reply_mv(struct smb_request *req)
                }
        }
 
-       DEBUG(3,("reply_mv : %s -> %s\n", smb_fname_str_dbg(smb_fname_src),
-                smb_fname_str_dbg(smb_fname_dst)));
+       DBG_NOTICE("%s -> %s\n",
+                  smb_fname_str_dbg(smb_fname_src),
+                  smb_fname_str_dbg(smb_fname_dst));
 
        status = rename_internals(ctx,
                                conn,

diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c
index ab12399956913deb03ffe33b08a3f9044997dbbf..2b65fb30d76a807c444b0fbd059932c529df6774 100644 (file)
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -1547,9 +1547,9 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
        if (strcsequal(fsp->fsp_name->base_name, smb_fname_dst->base_name) &&
            strcsequal(fsp->fsp_name->stream_name,
                       smb_fname_dst->stream_name)) {
-               DEBUG(3, ("rename_internals_fsp: identical names in rename %s "
-                         "- returning success\n",
-                         smb_fname_str_dbg(smb_fname_dst)));
+               DBG_NOTICE("identical names in rename %s "
+                          "- returning success\n",
+                          smb_fname_str_dbg(smb_fname_dst));
                status = NT_STATUS_OK;
                goto out;
        }
@@ -1571,9 +1571,10 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
        dst_exists = vfs_stat(conn, smb_fname_dst) == 0;
 
        if(!replace_if_exists && dst_exists) {
-               DEBUG(3, ("rename_internals_fsp: dest exists doing rename "
-                         "%s -> %s\n", smb_fname_str_dbg(fsp->fsp_name),
-                         smb_fname_str_dbg(smb_fname_dst)));
+               DBG_NOTICE("dest exists doing rename "
+                          "%s -> %s\n",
+                          smb_fname_str_dbg(fsp->fsp_name),
+                          smb_fname_str_dbg(smb_fname_dst));
                status = NT_STATUS_OBJECT_NAME_COLLISION;
                goto out;
        }
@@ -1595,7 +1596,7 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
                                                           fileid, true);
                /* The file can be open when renaming a stream */
                if (dst_fsp && !new_is_stream) {
-                       DEBUG(3, ("rename_internals_fsp: Target file open\n"));
+                       DBG_NOTICE("Target file open\n");
                        status = NT_STATUS_ACCESS_DENIED;
                        goto out;
                }
@@ -1610,9 +1611,10 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
        status = can_rename(conn, fsp, attrs);
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(3, ("rename_internals_fsp: Error %s rename %s -> %s\n",
-                         nt_errstr(status), smb_fname_str_dbg(fsp->fsp_name),
-                         smb_fname_str_dbg(smb_fname_dst)));
+               DBG_NOTICE("Error %s rename %s -> %s\n",
+                          nt_errstr(status),
+                          smb_fname_str_dbg(fsp->fsp_name),
+                          smb_fname_str_dbg(smb_fname_dst));
                if (NT_STATUS_EQUAL(status,NT_STATUS_SHARING_VIOLATION))
                        status = NT_STATUS_ACCESS_DENIED;
                goto out;
@@ -1757,9 +1759,10 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
        if (ret == 0) {
                uint32_t create_options = fh_get_private_options(fsp->fh);
 
-               DEBUG(3, ("rename_internals_fsp: succeeded doing rename on "
-                         "%s -> %s\n", smb_fname_str_dbg(fsp->fsp_name),
-                         smb_fname_str_dbg(smb_fname_dst)));
+               DBG_NOTICE("succeeded doing rename on "
+                          "%s -> %s\n",
+                          smb_fname_str_dbg(fsp->fsp_name),
+                          smb_fname_str_dbg(smb_fname_dst));
 
                notify_rename(conn,
                              fsp->fsp_flags.is_directory,
@@ -1825,9 +1828,10 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
                status = map_nt_error_from_unix(errno);
        }
 
-       DEBUG(3, ("rename_internals_fsp: Error %s rename %s -> %s\n",
-                 nt_errstr(status), smb_fname_str_dbg(fsp->fsp_name),
-                 smb_fname_str_dbg(smb_fname_dst)));
+       DBG_NOTICE("Error %s rename %s -> %s\n",
+                  nt_errstr(status),
+                  smb_fname_str_dbg(fsp->fsp_name),
+                  smb_fname_str_dbg(smb_fname_dst));
 
  out:
 

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 09cd7594465222d60aa9f2531c51a1ebd211cdfa..304fdda654f3bd9b168a284c66793c959a7c95ac 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -761,10 +761,13 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp,
 
                canonicalize_ea_name(fsp, unix_ea_name);
 
-               DEBUG(10,("set_ea: ea_name %s ealen = %u\n", unix_ea_name, (unsigned int)ea_list->ea.value.length));
+               DBG_DEBUG("ea_name %s ealen = %zu\n",
+                         unix_ea_name,
+                         ea_list->ea.value.length);
 
                if (samba_private_attr_name(unix_ea_name)) {
-                       DEBUG(10,("set_ea: ea name %s is a private Samba name.\n", unix_ea_name));
+                       DBG_DEBUG("ea name %s is a private Samba name.\n",
+                                 unix_ea_name);
                        return NT_STATUS_ACCESS_DENIED;
                }
 
@@ -777,15 +780,17 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp,
 #ifdef ENOATTR
                        /* Removing a non existent attribute always succeeds. */
                        if (ret == -1 && errno == ENOATTR) {
-                               DEBUG(10,("set_ea: deleting ea name %s didn't exist - succeeding by default.\n",
-                                               unix_ea_name));
+                               DBG_DEBUG("deleting ea name %s didn't exist - "
+                                         "succeeding by default.\n",
+                                         unix_ea_name);
                                ret = 0;
                        }
 #endif
                } else {
-                       DEBUG(10,("set_ea: setting ea name %s on file "
+                       DBG_DEBUG("setting ea name %s on file "
                                  "%s by file descriptor.\n",
-                                 unix_ea_name, fsp_str_dbg(fsp)));
+                                 unix_ea_name,
+                                 fsp_str_dbg(fsp));
                        ret = SMB_VFS_FSETXATTR(fsp, unix_ea_name,
                                                ea_list->ea.value.data, ea_list->ea.value.length, 0);
                }
@@ -4368,8 +4373,7 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
                return status;
        }
 
-       DEBUG(10,("smb2_file_rename_information: got name |%s|\n",
-                               newname));
+       DBG_DEBUG("got name |%s|\n", newname);
 
        if (newname[0] == ':') {
                /* Create an smb_fname to call rename_internals_fsp() with. */
@@ -4409,10 +4413,11 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
                goto out;
        }
 
-       DEBUG(10,("smb2_file_rename_information: "
-                 "SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
-                 fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
-                 smb_fname_str_dbg(smb_fname_dst)));
+       DBG_DEBUG("SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
+                 fsp_fnum_dbg(fsp),
+                 fsp_str_dbg(fsp),
+                 smb_fname_str_dbg(smb_fname_dst));
+
        status = rename_internals_fsp(conn,
                                fsp,
                                smb_fname_dst,