The branch, master has been updated
via ca157b3 vfs: Fix the O3 developer build
via e241b73 Fix a few printf format errors
via 81da2aa heimdal: Fix the O3 developer build
via 4ae2266 heimdal: Fix CID 240793 Uninitialized scalar variable
from 3876e59 vfs_gpfs: move failure label before END_PROFILE
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ca157b35ac572c3d983e51eee8be167075b440a4
Author: Volker Lendecke <v...@samba.org>
Date: Wed May 6 16:29:04 2015 +0200
vfs: Fix the O3 developer build
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu May 7 23:11:38 CEST 2015 on sn-devel-104
commit e241b739fb4c9100d96b8a2d6df989393695fa15
Author: Volker Lendecke <v...@samba.org>
Date: Wed May 6 16:25:51 2015 +0200
Fix a few printf format errors
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 81da2aa6056f47558534c247c6a1503e3d2576ac
Author: Volker Lendecke <v...@samba.org>
Date: Wed May 6 16:19:12 2015 +0200
heimdal: Fix the O3 developer build
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 4ae2266015e06dee5cd262d87b4895a73396b6b7
Author: Volker Lendecke <v...@samba.org>
Date: Sun May 3 09:29:51 2015 +0000
heimdal: Fix CID 240793 Uninitialized scalar variable
tmp.data is uninitialized in the fwrite call
Hopefully I don't create a problem here: If tmp.data is supposed to be
randomly
set, I think the right fix would have been to explicitly call a random
function
initializing it.
<j...@samba.org>
------------------------------------------------------------
I have looked through the code carefully. Your fix is safe.
The first entry in the replay file created in krb5_rc_initialize()
is only used to store the 'krb5_deltat auth_lifespan' value, the
associated data[16] value is never looked at. (Look at the
code in krb5_rc_store() and krb5_rc_get_lifespan() to confirm).
Only subsequent data[16] values are checked with memcmp.
------------------------------------------------------------
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/util_runcmd.c | 2 +-
source3/modules/vfs_aio_fork.c | 4 ++--
source3/modules/vfs_fruit.c | 5 +++--
source3/modules/vfs_solarisacl.c | 2 +-
source3/rpc_server/fssd.c | 3 ++-
source4/heimdal/lib/krb5/fcache.c | 2 +-
source4/heimdal/lib/krb5/replay.c | 3 +--
source4/smbd/process_standard.c | 9 +++++----
8 files changed, 16 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c
index 46c455d..f18e37b 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 dea8107..b15cf9d 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 dffb260..8a5588d 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/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index efd2d75..cf25abc 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -172,7 +172,7 @@ int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,
goto done;
}
if (S_ISDIR(s.st_ex_mode)) {
- SOLARIS_ACL_T other_acl;
+ SOLARIS_ACL_T other_acl = NULL;
int other_count;
SMB_ACL_TYPE_T other_type;
diff --git a/source3/rpc_server/fssd.c b/source3/rpc_server/fssd.c
index fc1f630..0f8b02e 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/heimdal/lib/krb5/fcache.c
b/source4/heimdal/lib/krb5/fcache.c
index a9e8327..cb720c0 100644
--- a/source4/heimdal/lib/krb5/fcache.c
+++ b/source4/heimdal/lib/krb5/fcache.c
@@ -1051,7 +1051,7 @@ fcc_lastchange(krb5_context context, krb5_ccache id,
krb5_timestamp *mtime)
{
krb5_error_code ret;
struct stat sb;
- int fd;
+ int fd = 0;
ret = fcc_open(context, id, &fd, O_RDONLY | O_BINARY | O_CLOEXEC, 0);
if(ret)
diff --git a/source4/heimdal/lib/krb5/replay.c
b/source4/heimdal/lib/krb5/replay.c
index 965dd44..d85424d 100644
--- a/source4/heimdal/lib/krb5/replay.c
+++ b/source4/heimdal/lib/krb5/replay.c
@@ -129,7 +129,7 @@ krb5_rc_initialize(krb5_context context,
krb5_deltat auth_lifespan)
{
FILE *f = fopen(id->name, "w");
- struct rc_entry tmp;
+ struct rc_entry tmp = { .stamp = auth_lifespan };
int ret;
if(f == NULL) {
@@ -139,7 +139,6 @@ krb5_rc_initialize(krb5_context context,
krb5_set_error_message(context, ret, "open(%s): %s", id->name, buf);
return ret;
}
- tmp.stamp = auth_lifespan;
fwrite(&tmp, 1, sizeof(tmp), f);
fclose(f);
return 0;
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index e2b9f13..b55a1a7 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;
--
Samba Shared Repository
