summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/util/util_runcmd.c2
-rw-r--r--source3/modules/vfs_aio_fork.c4
-rw-r--r--source3/modules/vfs_fruit.c5
-rw-r--r--source3/rpc_server/fssd.c3
-rw-r--r--source4/smbd/process_standard.c9
5 files changed, 13 insertions, 10 deletions
diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c
index 46c455d3d03..f18e37bcb2d 100644
--- a/lib/util/util_runcmd.c
+++ b/lib/util/util_runcmd.c
@@ -291,7 +291,7 @@ static void samba_runcmd_io_handler(struct tevent_context *ev,
DEBUG(0, ("Error in waitpid() unexpectedly got ECHILD "
"for %s child %d - %s, "
"someone has set SIGCHLD to SIG_IGN!\n",
- state->arg0, state->pid, strerror(errno)));
+ state->arg0, (int)state->pid, strerror(errno)));
tevent_req_error(req, errno);
return;
}
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index dea81070c9a..b15cf9dcfc8 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -398,7 +398,7 @@ static int aio_child_destructor(struct aio_child *child)
SMB_ASSERT(!child->busy);
DEBUG(10, ("aio_child_destructor: removing child %d on fd %d\n",
- child->pid, child->sockfd));
+ (int)child->pid, child->sockfd));
/*
* closing the sockfd makes the child not return from recvmsg() on RHEL
@@ -471,7 +471,7 @@ static int create_aio_child(struct smbd_server_connection *sconn,
}
DEBUG(10, ("Child %d created with sockfd %d\n",
- result->pid, fdpair[0]));
+ (int)result->pid, fdpair[0]));
result->sockfd = fdpair[0];
close(fdpair[1]);
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index dffb260acb7..8a5588dd67d 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1982,7 +1982,7 @@ static NTSTATUS check_ms_nfs(vfs_handle_struct *handle,
*pdo_chmod = true;
DEBUG(10, ("MS NFS chmod request %s, %04o\n",
- fsp_str_dbg(fsp), *pmode));
+ fsp_str_dbg(fsp), (unsigned)(*pmode)));
break;
}
}
@@ -3439,7 +3439,8 @@ static NTSTATUS fruit_fset_nt_acl(vfs_handle_struct *handle,
if (result != 0) {
DEBUG(1, ("chmod: %s, result: %d, %04o error %s\n", fsp_str_dbg(fsp),
- result, ms_nfs_mode, strerror(errno)));
+ result, (unsigned)ms_nfs_mode,
+ strerror(errno)));
status = map_nt_error_from_unix(errno);
return status;
}
diff --git a/source3/rpc_server/fssd.c b/source3/rpc_server/fssd.c
index fc1f630c6bb..0f8b02e9847 100644
--- a/source3/rpc_server/fssd.c
+++ b/source3/rpc_server/fssd.c
@@ -209,7 +209,8 @@ void start_fssd(struct tevent_context *ev_ctx,
exit(1);
}
- DEBUG(1, ("File Server Shadow-copy Daemon Started (%d)\n", getpid()));
+ DEBUG(1, ("File Server Shadow-copy Daemon Started (%d)\n",
+ (int)getpid()));
/* loop forever */
rc = tevent_loop_wait(ev_ctx);
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index e2b9f13046d..b55a1a7f309 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -104,12 +104,13 @@ static void standard_child_pipe_handler(struct tevent_context *ev,
DEBUG(0, ("Error in waitpid() unexpectedly got ECHILD "
"for child %d (%s) - %s, someone has set SIGCHLD "
"to SIG_IGN!\n",
- state->pid, state->name, strerror(errno)));
+ (int)state->pid, state->name,
+ strerror(errno)));
TALLOC_FREE(state);
return;
}
DEBUG(0, ("Error in waitpid() for child %d (%s) - %s \n",
- state->pid, state->name, strerror(errno)));
+ (int)state->pid, state->name, strerror(errno)));
if (errno == 0) {
errno = ECHILD;
}
@@ -119,11 +120,11 @@ static void standard_child_pipe_handler(struct tevent_context *ev,
if (WIFEXITED(status)) {
status = WEXITSTATUS(status);
DEBUG(2, ("Child %d (%s) exited with status %d\n",
- state->pid, state->name, status));
+ (int)state->pid, state->name, status));
} else if (WIFSIGNALED(status)) {
status = WTERMSIG(status);
DEBUG(0, ("Child %d (%s) terminated with signal %d\n",
- state->pid, state->name, status));
+ (int)state->pid, state->name, status));
}
TALLOC_FREE(state);
return;