From b908944081686a831d7811b6888578b91c3fbc80 Mon Sep 17 00:00:00 2001 From: SATOH Fumiyasu Date: Mon, 17 Dec 2012 19:26:27 +0900 Subject: [PATCH] libsmbclient: Replace d_printf() with DEBUG() to not taint stdout --- source3/libsmb/libsmb_context.c | 2 +- source3/libsmb/libsmb_dir.c | 14 +++++++------- source3/libsmb/libsmb_file.c | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index b529cbe..4a3cc73 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -715,7 +715,7 @@ smbc_set_credentials(const char *workgroup, smbc_bool use_kerberos, const char *signing_state) { - d_printf("smbc_set_credentials is obsolete. Replace with smbc_set_credentials_with_fallback().\n"); + DEBUG(0, ("smbc_set_credentials is obsolete. Replace with smbc_set_credentials_with_fallback().\n")); } void smbc_set_credentials_with_fallback(SMBCCTX *context, diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 700196c..ed9444a 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -812,7 +812,7 @@ SMBC_opendir_ctx(SMBCCTX *context, frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); if (dir) { SAFE_FREE(dir->fname); SAFE_FREE(dir); @@ -1217,7 +1217,7 @@ SMBC_mkdir_ctx(SMBCCTX *context, status = cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1326,7 +1326,7 @@ SMBC_rmdir_ctx(SMBCCTX *context, status = cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1611,7 +1611,7 @@ SMBC_chmod_ctx(SMBCCTX *context, status = cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1805,7 +1805,7 @@ SMBC_unlink_ctx(SMBCCTX *context, status = cli_resolve_path(frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1980,7 +1980,7 @@ SMBC_rename_ctx(SMBCCTX *ocontext, status = cli_resolve_path(frame, "", ocontext->internal->auth_info, srv->cli, path1, &targetcli1, &targetpath1); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path1); + DEBUG(0, ("Could not resolve %s\n", path1)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -1997,7 +1997,7 @@ SMBC_rename_ctx(SMBCCTX *ocontext, status = cli_resolve_path(frame, "", ncontext->internal->auth_info, srv->cli, path2, &targetcli2, &targetpath2); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path2); + DEBUG(0, ("Could not resolve %s\n", path2)); errno = ENOENT; TALLOC_FREE(frame); return -1; diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c index 9521542..ab5951d 100644 --- a/source3/libsmb/libsmb_file.c +++ b/source3/libsmb/libsmb_file.c @@ -115,7 +115,7 @@ SMBC_open_ctx(SMBCCTX *context, frame, "", context->internal->auth_info, srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; SAFE_FREE(file); TALLOC_FREE(frame); @@ -289,7 +289,7 @@ SMBC_read_ctx(SMBCCTX *context, file->srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -375,7 +375,7 @@ SMBC_write_ctx(SMBCCTX *context, file->srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -451,7 +451,7 @@ SMBC_close_ctx(SMBCCTX *context, file->srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -533,7 +533,7 @@ SMBC_getatr(SMBCCTX * context, srv->cli, fixedpath, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Couldn't resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return False; @@ -734,7 +734,7 @@ SMBC_lseek_ctx(SMBCCTX *context, frame, "", context->internal->auth_info, file->srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; @@ -825,7 +825,7 @@ SMBC_ftruncate_ctx(SMBCCTX *context, file->srv->cli, path, &targetcli, &targetpath); if (!NT_STATUS_IS_OK(status)) { - d_printf("Could not resolve %s\n", path); + DEBUG(0, ("Could not resolve %s\n", path)); errno = ENOENT; TALLOC_FREE(frame); return -1; -- 1.7.10.4