[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Mon Nov 29 07:35:02 MST 2010
The branch, master has been updated
via e9c40ef s4:wrepl_server - add a cast on "iov_base"
via 6ce6365 s4:lib/tls/tls_tstream.c - quiet warning on Solaris "cc" by casts
via bd4006f s4:auth/gensec/gensec_tstream.c - quiet warnings on Solaris "cc"
via 205c1e0 s4:wrepl_server - remove unreachable statement
via 40db0b8 s4:dcesrv_drsuapi RPC server - remove unreachable statement
via 821c962 s4:dns_server/dns_update.c - remove unreachable statements
via 3035fe0 libcli/security/object_tree.c - remove unreachable statement
via 87b887f s4:torture - remove unreachable statements to quiet warnings of Solaris "cc"
via 7fb9087 s4:auth/ntlmssp/ntlmssp_server.c - remove unnecessary ";"
via c4625a8 heimdal:base/heimbase.c - remove an unused variable
from 0852b0f s4:param/pyparam_util.c - remove unused include
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e9c40efdcf46cedd5df9679799ecfe391ccd147f
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:38:21 2010 +0100
s4:wrepl_server - add a cast on "iov_base"
Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date: Mon Nov 29 15:34:32 CET 2010 on sn-devel-104
commit 6ce63655ef1870afc8a9ee0c5e36346c4e92ee12
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:35:19 2010 +0100
s4:lib/tls/tls_tstream.c - quiet warning on Solaris "cc" by casts
commit bd4006fb9e904f6424e20ac11cd3c04924fdec30
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:31:53 2010 +0100
s4:auth/gensec/gensec_tstream.c - quiet warnings on Solaris "cc"
commit 205c1e0106184d025643d1f347b22305e04674c9
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:39:06 2010 +0100
s4:wrepl_server - remove unreachable statement
commit 40db0b8386dda20dde5a9f28ff99c600c9fb0e4e
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:37:38 2010 +0100
s4:dcesrv_drsuapi RPC server - remove unreachable statement
commit 821c962d2af0229e755bfbd8da43a24947cf1a33
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:36:46 2010 +0100
s4:dns_server/dns_update.c - remove unreachable statements
commit 3035fe041fdcd81dea6259d2022b287f790ebd8d
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:46:23 2010 +0100
libcli/security/object_tree.c - remove unreachable statement
commit 87b887f48fdd3d33376c4fdea7d6ef998f484f74
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:45:33 2010 +0100
s4:torture - remove unreachable statements to quiet warnings of Solaris "cc"
commit 7fb9087e64949ffb0d5e7ed0e28c6719c3fd294f
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:33:08 2010 +0100
s4:auth/ntlmssp/ntlmssp_server.c - remove unnecessary ";"
commit c4625a84dea7fa842623d343c17fe968c01edafc
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Nov 29 14:13:05 2010 +0100
heimdal:base/heimbase.c - remove an unused variable
-----------------------------------------------------------------------
Summary of changes:
libcli/security/object_tree.c | 1 -
source4/auth/gensec/gensec_tstream.c | 4 ++--
source4/auth/ntlmssp/ntlmssp_server.c | 2 +-
source4/dns_server/dns_update.c | 2 --
source4/heimdal/base/heimbase.c | 1 -
source4/lib/tls/tls_tstream.c | 4 ++--
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 1 -
source4/torture/basic/base.c | 2 --
source4/torture/basic/misc.c | 2 --
source4/torture/raw/pingpong.c | 3 ---
source4/torture/raw/tconrate.c | 3 ---
source4/wrepl_server/wrepl_in_connection.c | 2 +-
source4/wrepl_server/wrepl_out_helpers.c | 2 --
13 files changed, 6 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/object_tree.c b/libcli/security/object_tree.c
index 6fa9585..6809c8e 100644
--- a/libcli/security/object_tree.c
+++ b/libcli/security/object_tree.c
@@ -83,7 +83,6 @@ bool insert_in_object_tree(TALLOC_CTX *mem_ctx,
(*root)->num_of_children++;
return true;
}
- return true;
}
/* search by GUID */
diff --git a/source4/auth/gensec/gensec_tstream.c b/source4/auth/gensec/gensec_tstream.c
index de3d4fe..3bc69ab 100644
--- a/source4/auth/gensec/gensec_tstream.c
+++ b/source4/auth/gensec/gensec_tstream.c
@@ -192,7 +192,7 @@ static void tstream_gensec_readv_wrapped_next(struct tevent_req *req)
memcpy(base, tgss->read.unwrapped.data + tgss->read.ofs, len);
base += len;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (char *) base;
state->vector[0].iov_len -= len;
tgss->read.ofs += len;
@@ -457,7 +457,7 @@ static void tstream_gensec_writev_wrapped_next(struct tevent_req *req)
memcpy(state->unwrapped.blob.data + state->unwrapped.ofs, base, len);
base += len;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (char *) base;
state->vector[0].iov_len -= len;
state->unwrapped.ofs += len;
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 8623c1d..a5ff13e 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -75,7 +75,7 @@ NTSTATUS gensec_ntlmssp_server_auth(struct gensec_security *gensec_security,
struct gensec_ntlmssp_context);
struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
return ntlmssp_server_auth(ntlmssp_state, out_mem_ctx, in, out);
-};
+}
/**
* Return the challenge as determined by the authentication subsystem
diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index f789f2d..a9fabf6 100644
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -64,7 +64,6 @@ static WERROR check_prerequsites(struct dns_server *dns,
/* TODO: Check if RR exists of the specified type */
return DNS_ERR(NXRRSET);
}
- continue;
}
if (r->rr_class == DNS_QCLASS_NONE) {
if (r->length != 0) {
@@ -77,7 +76,6 @@ static WERROR check_prerequsites(struct dns_server *dns,
/* TODO: Return error if there's an RRset of this type in the zone */
return DNS_ERR(YXRRSET);
}
- continue;
}
if (r->rr_class == zone->question_class) {
/* Check if there's a RR with this */
diff --git a/source4/heimdal/base/heimbase.c b/source4/heimdal/base/heimbase.c
index a6caad2..137129a 100644
--- a/source4/heimdal/base/heimbase.c
+++ b/source4/heimdal/base/heimbase.c
@@ -334,7 +334,6 @@ heim_base_once_f(heim_base_once_t *once, void *ctx, void (*func)(void *))
} else {
HEIMDAL_MUTEX_unlock(&mutex);
while (1) {
- struct timeval tv = { 0, 1000 };
HEIMDAL_MUTEX_lock(&mutex);
if (*once == 2)
break;
diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
index 7f37643..8e80454 100644
--- a/source4/lib/tls/tls_tstream.c
+++ b/source4/lib/tls/tls_tstream.c
@@ -460,7 +460,7 @@ static void tstream_tls_readv_crypt_next(struct tevent_req *req)
memcpy(base, tlss->read.buffer + tlss->read.ofs, len);
base += len;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (char *) base;
state->vector[0].iov_len -= len;
tlss->read.ofs += len;
@@ -631,7 +631,7 @@ static void tstream_tls_writev_crypt_next(struct tevent_req *req)
memcpy(tlss->write.buffer + tlss->write.ofs, base, len);
base += len;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (char *) base;
state->vector[0].iov_len -= len;
tlss->write.ofs += len;
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 429fc31..592edb5 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -455,7 +455,6 @@ static WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TA
return dcesrv_drsuapi_CrackNamesByNameFormat(b_state->sam_ctx, mem_ctx,
&r->in.req->req1, &r->out.ctr->ctr1);
}
- return WERR_OK;
}
}
return WERR_UNKNOWN_LEVEL;
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index d5090e9..9953573 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1360,8 +1360,6 @@ static bool run_iometer(struct torture_context *tctx,
smbcli_errstr(cli->tree)));
}
}
-
- return true;
}
/**
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 7223272..c590237 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -289,8 +289,6 @@ bool torture_holdopen(struct torture_context *tctx,
fflush(stdout);
sleep(15);
}
-
- return true;
}
/*
diff --git a/source4/torture/raw/pingpong.c b/source4/torture/raw/pingpong.c
index 124cf69..f9c551e 100644
--- a/source4/torture/raw/pingpong.c
+++ b/source4/torture/raw/pingpong.c
@@ -243,8 +243,5 @@ bool torture_ping_pong(struct torture_context *torture)
}
loops++;
}
-
- talloc_free(mem_ctx);
- return true;
}
diff --git a/source4/torture/raw/tconrate.c b/source4/torture/raw/tconrate.c
index 7202943..b7ec156 100644
--- a/source4/torture/raw/tconrate.c
+++ b/source4/torture/raw/tconrate.c
@@ -135,9 +135,6 @@ static bool children_remain(void)
return errno == ECHILD ? false : true;
}
}
-
- /* notreached */
- return false;
}
static double rate_convert_secs(unsigned count,
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 3e2faa2..9d3ddbf 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -241,7 +241,7 @@ static void wreplsrv_call_loop(struct tevent_req *subreq)
goto noreply;
}
- call->out_iov[0].iov_base = call->out.data;
+ call->out_iov[0].iov_base = (char *) call->out.data;
call->out_iov[0].iov_len = call->out.length;
subreq = tstream_writev_queue_send(call,
diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c
index dcbc888..cee7bfa 100644
--- a/source4/wrepl_server/wrepl_out_helpers.c
+++ b/source4/wrepl_server/wrepl_out_helpers.c
@@ -967,8 +967,6 @@ static NTSTATUS wreplsrv_push_notify_wait_connect(struct wreplsrv_push_notify_st
default:
return NT_STATUS_INTERNAL_ERROR;
}
-
- return NT_STATUS_INTERNAL_ERROR;
}
static NTSTATUS wreplsrv_push_notify_wait_update(struct wreplsrv_push_notify_state *state)
--
Samba Shared Repository
More information about the samba-cvs
mailing list