From: Joseph Sutton Date: Mon, 7 Aug 2023 04:37:51 +0000 (+1200) Subject: s3:modules: Add missing newlines to logging messages X-Git-Tag: tevent-0.16.0~1146 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cef6692ba0032a02a2807b63c7922b4b22ce8400;p=thirdparty%2Fsamba.git s3:modules: Add missing newlines to logging messages Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 2daae990042..1e18ae3b1cf 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -338,7 +338,7 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, 2 * acl->naces); if (nt_ace_list==NULL) { - DEBUG(10, ("talloc error with %d aces", acl->naces)); + DEBUG(10, ("talloc error with %d aces\n", acl->naces)); errno = ENOMEM; return false; } @@ -468,7 +468,7 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, /* returns a NULL ace list when good_aces is zero. */ if (good_aces && nt_ace_list == NULL) { - DEBUG(10, ("realloc error with %d aces", good_aces)); + DEBUG(10, ("realloc error with %d aces\n", good_aces)); errno = ENOMEM; return false; } diff --git a/source3/modules/nfs4acl_xattr_nfs.c b/source3/modules/nfs4acl_xattr_nfs.c index 698630f3e6f..df3c0f52697 100644 --- a/source3/modules/nfs4acl_xattr_nfs.c +++ b/source3/modules/nfs4acl_xattr_nfs.c @@ -177,7 +177,7 @@ static size_t nfs40acl_get_xdrblob_size(nfsacl40 *nacl) acl_size = sizeof(unsigned); if (naces > NFS4ACL_XDR_MAX_ACES) { - DBG_ERR("Too many ACEs: %u", naces); + DBG_ERR("Too many ACEs: %u\n", naces); return 0; } @@ -241,7 +241,7 @@ static size_t nfs41acl_get_xdrblob_size(nfsacl41 *nacl) acl_size = 2 * sizeof(unsigned); if (naces > NFS4ACL_XDR_MAX_ACES) { - DBG_ERR("Too many ACEs: %u", naces); + DBG_ERR("Too many ACEs: %u\n", naces); return 0; } diff --git a/source3/modules/nfs4acl_xattr_xdr.c b/source3/modules/nfs4acl_xattr_xdr.c index ff5b667cbc7..439378eeb19 100644 --- a/source3/modules/nfs4acl_xattr_xdr.c +++ b/source3/modules/nfs4acl_xattr_xdr.c @@ -73,7 +73,7 @@ static size_t nfs4acli_get_xdrblob_size(nfsacl41i *nacl) acl_size = sizeof(aclflag4) + sizeof(unsigned); if (naces > NFS4ACL_XDR_MAX_ACES) { - DBG_ERR("Too many ACEs: %u", naces); + DBG_ERR("Too many ACEs: %u\n", naces); return 0; } diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 746c4423f44..3dc80d3bddc 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -75,7 +75,7 @@ static bool init_afs_acl(struct afs_acl *acl) ZERO_STRUCT(*acl); acl->ctx = talloc_init("afs_acl"); if (acl->ctx == NULL) { - DEBUG(10, ("Could not init afs_acl")); + DEBUG(10, ("Could not init afs_acl\n")); return false; } return true; diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index 26d2a566907..4a4759fcfdd 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -408,7 +408,7 @@ int aixjfs2_sys_acl_set_fd(vfs_handle_struct *handle, acl_type_t acl_type_info; int rc; - DEBUG(10, ("aixjfs2_sys_acl_set_fd invoked for %s", fsp_str_dbg(fsp))); + DEBUG(10, ("aixjfs2_sys_acl_set_fd invoked for %s\n", fsp_str_dbg(fsp))); rc = aixjfs2_query_acl_support(fsp->fsp_name->base_name, ACL_AIXC, &acl_type_info); diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index d7772c62119..4bcefcf91e8 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -848,7 +848,7 @@ static void init_stat_ex_from_ceph_statx(struct stat_ex *dst, const struct ceph_ llu(stx->stx_btime.tv_sec)); if ((stx->stx_mask & SAMBA_STATX_ATTR_MASK) != SAMBA_STATX_ATTR_MASK) { - DBG_WARNING("%s: stx->stx_mask is incorrect (wanted %x, got %x)", + DBG_WARNING("%s: stx->stx_mask is incorrect (wanted %x, got %x)\n", __func__, SAMBA_STATX_ATTR_MASK, stx->stx_mask); } diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c index 91dce6c7dc5..ea784ff6eba 100644 --- a/source3/modules/vfs_extd_audit.c +++ b/source3/modules/vfs_extd_audit.c @@ -378,7 +378,7 @@ static int audit_fchmod(vfs_handle_struct *handle, files_struct *fsp, mode_t mod (result < 0) ? "failed: " : "", (result < 0) ? strerror(errno) : ""); } - DEBUG(1, ("vfs_extd_audit: fchmod %s mode 0x%x %s %s", + DEBUG(1, ("vfs_extd_audit: fchmod %s mode 0x%x %s %s\n", fsp_str_dbg(fsp), (unsigned int)mode, (result < 0) ? "failed: " : "", (result < 0) ? strerror(errno) : "")); diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 49a1723864e..53afdc9103d 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -2390,7 +2390,7 @@ static ssize_t fruit_pread_meta(vfs_handle_struct *handle, } if (fio == NULL) { - DBG_ERR("Failed to fetch fsp extension"); + DBG_ERR("Failed to fetch fsp extension\n"); return -1; } @@ -2797,7 +2797,7 @@ static ssize_t fruit_pwrite_meta(vfs_handle_struct *handle, int cmp; if (fio == NULL) { - DBG_ERR("Failed to fetch fsp extension"); + DBG_ERR("Failed to fetch fsp extension\n"); return -1; } @@ -2936,7 +2936,7 @@ static ssize_t fruit_pwrite_rsrc(vfs_handle_struct *handle, ssize_t nwritten; if (fio == NULL) { - DBG_ERR("Failed to fetch fsp extension"); + DBG_ERR("Failed to fetch fsp extension\n"); return -1; } @@ -4176,7 +4176,7 @@ static int fruit_ftruncate_rsrc(struct vfs_handle_struct *handle, int ret; if (fio == NULL) { - DBG_ERR("Failed to fetch fsp extension"); + DBG_ERR("Failed to fetch fsp extension\n"); return -1; } @@ -4207,7 +4207,7 @@ static int fruit_ftruncate_meta(struct vfs_handle_struct *handle, off_t offset) { if (offset > 60) { - DBG_WARNING("ftruncate %s to %jd", + DBG_WARNING("ftruncate %s to %jd\n", fsp_str_dbg(fsp), (intmax_t)offset); /* OS X returns NT_STATUS_ALLOTTED_SPACE_EXCEEDED */ errno = EOVERFLOW; diff --git a/source3/modules/vfs_glusterfs_fuse.c b/source3/modules/vfs_glusterfs_fuse.c index 3eb4dc27d54..88c740c0b8a 100644 --- a/source3/modules/vfs_glusterfs_fuse.c +++ b/source3/modules/vfs_glusterfs_fuse.c @@ -214,7 +214,7 @@ static struct file_id vfs_glusterfs_fuse_file_id_create( id.devid = mapped_device; } else { DBG_WARNING("Failed to map device [%jx], falling back to " - "standard file_id [%jx]", + "standard file_id [%jx]\n", (uintmax_t)sbuf->st_ex_dev, (uintmax_t)id.devid); } diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 3398879c900..21ede6cea5a 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -1784,7 +1784,7 @@ static int vfs_gpfs_fntimes(struct vfs_handle_struct *handle, if (ret == -1) { /* don't complain if access was denied */ if (errno != EPERM && errno != EACCES) { - DBG_WARNING("SMB_VFS_NEXT_FNTIMES failed: %s", + DBG_WARNING("SMB_VFS_NEXT_FNTIMES failed: %s\n", strerror(errno)); } return -1; diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c index 6549405b119..89191f7e3ae 100644 --- a/source3/modules/vfs_tsmsm.c +++ b/source3/modules/vfs_tsmsm.c @@ -505,7 +505,7 @@ static NTSTATUS tsmsm_set_offline(struct vfs_handle_struct *handle, /* Now, call the script */ command = talloc_asprintf(tsmd, "%s offline \"%s\"", tsmd->hsmscript, path); if(!command) { - DEBUG(1, ("tsmsm_set_offline: can't allocate memory to run hsm script")); + DEBUG(1, ("tsmsm_set_offline: can't allocate memory to run hsm script\n")); return NT_STATUS_NO_MEMORY; } DEBUG(10, ("tsmsm_set_offline: Running [%s]\n", command)); diff --git a/source3/modules/vfs_unityed_media.c b/source3/modules/vfs_unityed_media.c index 30608c31018..8da7316ec4f 100644 --- a/source3/modules/vfs_unityed_media.c +++ b/source3/modules/vfs_unityed_media.c @@ -255,7 +255,7 @@ static bool is_in_media_dir(const char *path) const char *media_dirname; size_t media_dirname_len; - DEBUG(10, ("Entering with path'%s' ", path)); + DEBUG(10, ("Entering with path'%s'\n", path)); /* Sometimes Samba gives us "./OMFI MediaFiles". */ if (strnequal(path, "./", 2)) { @@ -662,7 +662,7 @@ um_readdir(vfs_handle_struct *handle, struct files_struct *dirfsp, DIR *dirp) (void)get_digit_group(dname, &number); digits = talloc_asprintf(talloc_tos(), "%ju", number); if (digits == NULL) { - DEBUG(1, ("out of memory")); + DEBUG(1, ("out of memory\n")); goto err; } digits_len = strlen(digits); diff --git a/source3/modules/vfs_virusfilter.c b/source3/modules/vfs_virusfilter.c index 124b4091c1b..b24cc0ea9a9 100644 --- a/source3/modules/vfs_virusfilter.c +++ b/source3/modules/vfs_virusfilter.c @@ -475,7 +475,7 @@ static int virusfilter_vfs_connect( config->io_h = virusfilter_io_new(config, connect_timeout, io_timeout); if (config->io_h == NULL) { - DBG_ERR("virusfilter_io_new failed"); + DBG_ERR("virusfilter_io_new failed\n"); return -1; } @@ -1221,7 +1221,7 @@ virusfilter_scan_result_eval: scan_result, scan_report); if (!ok) { DBG_ERR("Cannot create cache entry: " - "virusfilter_cache_entry_new failed"); + "virusfilter_cache_entry_new failed\n"); goto virusfilter_scan_return; } } else if (is_cache) { diff --git a/source3/modules/vfs_vxfs.c b/source3/modules/vfs_vxfs.c index c41d050e4ef..aae2ca17337 100644 --- a/source3/modules/vfs_vxfs.c +++ b/source3/modules/vfs_vxfs.c @@ -542,7 +542,7 @@ static int vxfs_fset_xattr(struct vfs_handle_struct *handle, return ret; } - DBG_DEBUG("Fallback to xattr"); + DBG_DEBUG("Fallback to xattr\n"); if (strcmp(name, XATTR_NTACL_NAME) == 0) { return SMB_VFS_NEXT_FSETXATTR(handle, fsp, XATTR_USER_NTACL, value, size, flags); diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index d69d7003110..27ea7b55c6a 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -245,9 +245,9 @@ static bool zfs_process_smbacl(vfs_handle_struct *handle, files_struct *fsp, if(errno == ENOSYS) { DEBUG(9, ("acl(ACE_SETACL, %s): Operation is not " "supported on the filesystem where the file " - "reside", fsp_str_dbg(fsp))); + "reside\n", fsp_str_dbg(fsp))); } else { - DEBUG(9, ("acl(ACE_SETACL, %s): %s ", fsp_str_dbg(fsp), + DEBUG(9, ("acl(ACE_SETACL, %s): %s\n", fsp_str_dbg(fsp), strerror(errno))); } return false; @@ -298,7 +298,7 @@ static int fget_zfsacl(TALLOC_CTX *mem_ctx, if (errno == ENOSYS) { dbg_level = 1; } - DEBUG(dbg_level, ("facl(ACE_GETACLCNT, %s): %s ", + DEBUG(dbg_level, ("facl(ACE_GETACLCNT, %s): %s\n", fsp_str_dbg(fsp), strerror(errno))); return naces; } @@ -311,7 +311,7 @@ static int fget_zfsacl(TALLOC_CTX *mem_ctx, rv = facl(fd, ACE_GETACL, naces, acebuf); if (rv == -1) { - DBG_DEBUG("acl(ACE_GETACL, %s): %s ", + DBG_DEBUG("acl(ACE_GETACL, %s): %s\n", fsp_str_dbg(fsp), strerror(errno)); return -1; }