The branch, master has been updated
via c06a31d Fix const warnings.
via cbfe802 Fix const warning.
via 24ce9d5 Fix const warning.
via 06fb258 release_ip() is only used with CLUSTER_SUPPORT.
via db46a9d Fix type mixing warnings.
via b08bd96 Fix bug where format arguments were reversed. Please
compile with -Wall !
from febde0d Move fd_close on error path to be identical to all other
error paths.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c06a31dd65900f183e880cb5d135584aecbcc479
Author: Jeremy Allison <[email protected]>
Date: Wed Jun 1 14:51:55 2011 -0700
Fix const warnings.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Thu Jun 2 01:02:53 CEST 2011 on sn-devel-104
commit cbfe8029a4890355a953813f6f588ed015ac077c
Author: Jeremy Allison <[email protected]>
Date: Wed Jun 1 14:51:21 2011 -0700
Fix const warning.
commit 24ce9d52a644a8d7aa8e2ef3de1bb8cb644db410
Author: Jeremy Allison <[email protected]>
Date: Wed Jun 1 14:50:49 2011 -0700
Fix const warning.
commit 06fb258500d04747d18b2b327221acd79c31f44c
Author: Jeremy Allison <[email protected]>
Date: Wed Jun 1 14:49:43 2011 -0700
release_ip() is only used with CLUSTER_SUPPORT.
commit db46a9d6348869794c0c0cf5d6c7079cdc334426
Author: Jeremy Allison <[email protected]>
Date: Wed Jun 1 14:49:03 2011 -0700
Fix type mixing warnings.
commit b08bd96dc0919ae1194f1269c01a78194d674e9c
Author: Jeremy Allison <[email protected]>
Date: Wed Jun 1 14:45:59 2011 -0700
Fix bug where format arguments were reversed. Please compile with -Wall !
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/ndr_string.c | 4 ++--
source3/rpc_server/rpc_handles.c | 4 ++--
source3/smbd/process.c | 2 +-
source3/utils/net_ads.c | 2 +-
source3/utils/net_lookup.c | 2 +-
source3/utils/testparm.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c
index cf4d972..4510a71 100644
--- a/librpc/ndr/ndr_string.c
+++ b/librpc/ndr/ndr_string.c
@@ -147,7 +147,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull
*ndr, int ndr_flags,
} else {
if (!do_convert) {
as = talloc_strndup(ndr->current_mem_ctx,
- ndr->data + ndr->offset,
+ (char *)ndr->data + ndr->offset,
conv_src_len);
if (!as) {
return ndr_pull_error(ndr, NDR_ERR_ALLOC,
@@ -231,7 +231,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push
*ndr, int ndr_flags,
if (!do_convert) {
d_len = s_len;
- dest = talloc_strndup(ndr, s, s_len);
+ dest = (uint8_t *)talloc_strndup(ndr, s, s_len);
} else if (!convert_string_talloc(ndr, CH_UNIX, chset, s, s_len,
(void **)(void *)&dest, &d_len))
{
diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index 0b30251..7fa59b6 100644
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -363,9 +363,9 @@ void *_policy_handle_create(struct pipes_struct *p, struct
policy_handle *hnd,
if (p->pipe_handles->count > MAX_OPEN_POLS) {
DEBUG(0, ("ERROR: Too many handles (%d) for RPC connection
%s\n",
+ (int) p->pipe_handles->count,
get_pipe_name_from_syntax(talloc_tos(),
- &p->contexts->syntax),
- (int) p->pipe_handles->count));
+ &p->contexts->syntax)));
*pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
return NULL;
}
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index dbc0a33..7d96263 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2346,6 +2346,7 @@ static void smbd_server_echo_handler(struct event_context
*ev,
}
}
+#ifdef CLUSTER_SUPPORT
/****************************************************************************
received when we should release a specific IP
****************************************************************************/
@@ -2375,7 +2376,6 @@ static void release_ip(const char *ip, void *priv)
}
}
-#ifdef CLUSTER_SUPPORT
static int client_get_tcp_info(int sock, struct sockaddr_storage *server,
struct sockaddr_storage *client)
{
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index f712ddf..69d5b10 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -2023,7 +2023,7 @@ static int net_ads_password(struct net_context *c, int
argc, const char **argv)
ADS_STRUCT *ads;
const char *auth_principal = c->opt_user_name;
const char *auth_password = c->opt_password;
- char *realm = NULL;
+ const char *realm = NULL;
const char *new_password = NULL;
char *chr, *prompt;
const char *user;
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 4191825..febf481 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -293,7 +293,7 @@ static int net_lookup_kdc(struct net_context *c, int argc,
const char **argv)
realm.data = discard_const_p(char, argv[0]);
realm.length = strlen(argv[0]);
} else if (lp_realm() && *lp_realm()) {
- realm.data = lp_realm();
+ realm.data = discard_const_p(char, lp_realm());
realm.length = strlen((const char *)realm.data);
} else {
rc = krb5_get_host_realm(ctx, NULL, &realms);
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index aa48771..870ba27 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -39,7 +39,7 @@
Check if a directory exists.
********************************************************************/
-static bool directory_exist_stat(char *dname,SMB_STRUCT_STAT *st)
+static bool directory_exist_stat(const char *dname,SMB_STRUCT_STAT *st)
{
SMB_STRUCT_STAT st2;
bool ret;
--
Samba Shared Repository
