The branch, master has been updated
via 07af8f2 s4:client/client.c - fix wrong return codes in "do_connect"
via 9d4dc69 s4:lib/policy/gp_filesys.c - remove dead code
via 55bc079 s4:torture/locktest.c - add a cast in order to quiet a
warning on Solaris cc
via ace43d4 s4:libcli/wrepl/winsrepl.c - add more "char *" casts in
order to suppress Solaris warnings
via 5c33ef2 s3/s4:libcli/tstream - add more "char *" casts in order to
suppress Solaris warnings
via ece428f s4:torture/ntp/ntp_signd.c - add more "char *" casts in
order to suppress Solaris warnings
from 68c9877 s3-printing: fix non-ads build after prototype changes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 07af8f2514c4fbc94487eb2234d4fc764481e06a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Sep 10 22:39:39 2010 +0200
s4:client/client.c - fix wrong return codes in "do_connect"
Detected by the Solaris cc compiler.
commit 9d4dc69627b709d134ad0b8850a777ae33aaa4e7
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Sep 10 22:26:24 2010 +0200
s4:lib/policy/gp_filesys.c - remove dead code
Found out by Solaris cc
commit 55bc079b9ab24f583bf1ec66947e4bcb8a112794
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Sep 10 22:35:10 2010 +0200
s4:torture/locktest.c - add a cast in order to quiet a warning on Solaris cc
commit ace43d4ccd5e225bbefec7e9f3a3f64e07e3c99a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Sep 10 22:22:14 2010 +0200
s4:libcli/wrepl/winsrepl.c - add more "char *" casts in order to suppress
Solaris warnings
commit 5c33ef2758d8e8d3978feef9056e79bce31c9d74
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Sep 10 22:22:14 2010 +0200
s3/s4:libcli/tstream - add more "char *" casts in order to suppress Solaris
warnings
commit ece428f02c981eea4b8a0997fbe55d5ecf39c1a0
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Sep 10 22:22:14 2010 +0200
s4:torture/ntp/ntp_signd.c - add more "char *" casts in order to suppress
Solaris warnings
-----------------------------------------------------------------------
Summary of changes:
libcli/named_pipe_auth/npa_tstream.c | 24 ++++++++++++------------
libcli/util/tstream.c | 4 ++--
source4/client/client.c | 4 ++--
source4/lib/policy/gp_filesys.c | 2 --
source4/libcli/wrepl/winsrepl.c | 2 +-
source4/torture/locktest.c | 2 +-
source4/torture/ntp/ntp_signd.c | 4 ++--
7 files changed, 20 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/named_pipe_auth/npa_tstream.c
b/libcli/named_pipe_auth/npa_tstream.c
index f6ce951..b0ef11f 100644
--- a/libcli/named_pipe_auth/npa_tstream.c
+++ b/libcli/named_pipe_auth/npa_tstream.c
@@ -172,7 +172,7 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX
*mem_ctx,
goto post;
}
- state->auth_req_iov.iov_base = state->auth_req_blob.data;
+ state->auth_req_iov.iov_base = (char *) state->auth_req_blob.data;
state->auth_req_iov.iov_len = state->auth_req_blob.length;
subreq = tstream_unix_connect_send(state,
@@ -313,7 +313,7 @@ static int tstream_npa_connect_next_vector(struct
tstream_context *unix_stream,
if (!vector) {
return -1;
}
- vector[0].iov_base = state->auth_rep_blob.data + ofs;
+ vector[0].iov_base = (char *) (state->auth_rep_blob.data + ofs);
vector[0].iov_len = state->auth_rep_blob.length - ofs;
count = 1;
@@ -575,7 +575,7 @@ static struct tevent_req *tstream_npa_readv_send(TALLOC_CTX
*mem_ctx,
memcpy(base, pbase + ofs, left);
base += left;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (char *) base;
state->vector[0].iov_len -= left;
ofs += left;
@@ -600,7 +600,7 @@ static struct tevent_req *tstream_npa_readv_send(TALLOC_CTX
*mem_ctx,
if (left > 0) {
memmove(pbase, pbase + ofs, left);
- npas->pending.iov_base = pbase;
+ npas->pending.iov_base = (char *) pbase;
npas->pending.iov_len = left;
/*
* this cannot fail and even if it
@@ -608,7 +608,7 @@ static struct tevent_req *tstream_npa_readv_send(TALLOC_CTX
*mem_ctx,
*/
pbase = talloc_realloc(npas, pbase, uint8_t, left);
if (pbase) {
- npas->pending.iov_base = pbase;
+ npas->pending.iov_base = (char *) pbase;
}
pbase = NULL;
}
@@ -696,7 +696,7 @@ static int tstream_npa_readv_next_vector(struct
tstream_context *unix_stream,
return -1;
}
ZERO_STRUCT(state->hdr);
- vector[0].iov_base = state->hdr;
+ vector[0].iov_base = (char *) state->hdr;
vector[0].iov_len = sizeof(state->hdr);
count = 1;
@@ -732,11 +732,11 @@ static int tstream_npa_readv_next_vector(struct
tstream_context *unix_stream,
if (left < state->vector[0].iov_len) {
uint8_t *base;
base = (uint8_t *)state->vector[0].iov_base;
- vector[count].iov_base = base;
+ vector[count].iov_base = (char *) base;
vector[count].iov_len = left;
count++;
base += left;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (char *) base;
state->vector[0].iov_len -= left;
break;
}
@@ -754,7 +754,7 @@ static int tstream_npa_readv_next_vector(struct
tstream_context *unix_stream,
* into the pending buffer, where the next readv can
* be served from.
*/
- npas->pending.iov_base = talloc_array(npas, uint8_t, left);
+ npas->pending.iov_base = talloc_array(npas, char, left);
if (!npas->pending.iov_base) {
return -1;
}
@@ -865,7 +865,7 @@ static struct tevent_req
*tstream_npa_writev_send(TALLOC_CTX *mem_ctx,
if (tevent_req_nomem(new_vector, req)) {
goto post;
}
- new_vector[0].iov_base = state->hdr;
+ new_vector[0].iov_base = (char *) state->hdr;
new_vector[0].iov_len = sizeof(state->hdr);
memcpy(new_vector + 1, vector, sizeof(struct iovec)*count);
@@ -1238,7 +1238,7 @@ static int tstream_npa_accept_next_vector(struct
tstream_context *unix_stream,
if (!vector) {
return -1;
}
- vector[0].iov_base = state->npa_blob.data + ofs;
+ vector[0].iov_base = (char *) (state->npa_blob.data + ofs);
vector[0].iov_len = state->npa_blob.length - ofs;
count = 1;
@@ -1442,7 +1442,7 @@ reply:
state->accept_status = pipe_reply.status;
- state->out_iov.iov_base = out.data;
+ state->out_iov.iov_base = (char *) out.data;
state->out_iov.iov_len = out.length;
subreq = tstream_writev_send(state, state->ev,
diff --git a/libcli/util/tstream.c b/libcli/util/tstream.c
index 9c42ca1..5d0e561 100644
--- a/libcli/util/tstream.c
+++ b/libcli/util/tstream.c
@@ -75,7 +75,7 @@ struct tevent_req *tstream_read_pdu_blob_send(TALLOC_CTX
*mem_ctx,
state->pdu_blob.data = buf;
state->pdu_blob.length = initial_read_size;
- state->tmp_vector.iov_base = buf;
+ state->tmp_vector.iov_base = (char *) buf;
state->tmp_vector.iov_len = initial_read_size;
subreq = tstream_readv_send(state, ev, stream, &state->tmp_vector, 1);
@@ -128,7 +128,7 @@ static void tstream_read_pdu_blob_done(struct tevent_req
*subreq)
state->pdu_blob.data = buf;
state->pdu_blob.length = pdu_size;
- state->tmp_vector.iov_base = buf + state->tmp_vector.iov_len;
+ state->tmp_vector.iov_base = (char *) (buf + state->tmp_vector.iov_len);
state->tmp_vector.iov_len = pdu_size - state->tmp_vector.iov_len;
subreq = tstream_readv_send(state,
diff --git a/source4/client/client.c b/source4/client/client.c
index 910a666..ee5357f 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3088,10 +3088,10 @@ static bool do_connect(struct smbclient_context *ctx,
d_printf("Connection to \\\\%s\\%s failed - %s\n",
server, share, nt_errstr(status));
talloc_free(ctx);
- return NULL;
+ return false;
}
- return ctx;
+ return true;
}
/****************************************************************************
diff --git a/source4/lib/policy/gp_filesys.c b/source4/lib/policy/gp_filesys.c
index bdc2337..00d04d5 100644
--- a/source4/lib/policy/gp_filesys.c
+++ b/source4/lib/policy/gp_filesys.c
@@ -178,8 +178,6 @@ static NTSTATUS gp_cli_connect(struct gp_context *gp_ctx)
&options,
&session_options,
lpcfg_gensec_settings(gp_ctx, gp_ctx->lp_ctx));
-
- return NT_STATUS_OK;
}
static char * gp_get_share_path(TALLOC_CTX *mem_ctx, const char *file_sys_path)
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 032be8f..83da217 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -373,7 +373,7 @@ struct tevent_req *wrepl_request_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev);
}
- state->req.iov.iov_base = state->req.blob.data;
+ state->req.iov.iov_base = (char *) state->req.blob.data;
state->req.iov.iov_len = state->req.blob.length;
ok = tevent_queue_add(wrepl_socket->request_queue,
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 7a236be..dff014b 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -233,7 +233,7 @@ static bool test_one(struct smbcli_state
*cli[NSERVERS][NCONNECTIONS],
int fn=fnum[server][conn][f];
if (!(tree->session->transport->negotiate.capabilities
& CAP_LARGE_FILES)) {
- res=smbcli_lock(tree, fn, start, len,
LOCK_TIMEOUT, rec->lock_op);
+ res=smbcli_lock(tree, fn, start, len,
LOCK_TIMEOUT, (enum brl_type) rec->lock_op);
} else {
union smb_lock parms;
int ltype;
diff --git a/source4/torture/ntp/ntp_signd.c b/source4/torture/ntp/ntp_signd.c
index ca5fb14..b651c76 100644
--- a/source4/torture/ntp/ntp_signd.c
+++ b/source4/torture/ntp/ntp_signd.c
@@ -192,10 +192,10 @@ static bool test_ntp_signd(struct torture_context *tctx,
* First add the length of the request buffer
*/
RSIVAL(signd_client->request_hdr, 0, sign_req_blob.length);
- signd_client->request_iov[0].iov_base = signd_client->request_hdr;
+ signd_client->request_iov[0].iov_base = (char *)
signd_client->request_hdr;
signd_client->request_iov[0].iov_len = 4;
- signd_client->request_iov[1].iov_base = sign_req_blob.data;
+ signd_client->request_iov[1].iov_base = (char *) sign_req_blob.data;
signd_client->request_iov[1].iov_len = sign_req_blob.length;
/* Fire the request buffer */
--
Samba Shared Repository
