The branch, master has been updated
via ecbe9a7... s4:kdc/db-glue.c - remove unreachable code
via 05f31c3... s4:registry/regf.c - add some casts to suppress build
warnings on Solaris
via 2adfe47... s4:registry/rpc.c - fix Solaris warnings by casts
via 2f49c8f... s4:samr RPC server - fix Solaris build warning
via 871cdec... s4:registry RPC server - quite some build warnings on
Solaris
via 82fd483... s4:lsa_lookup.c - fix type argument
via 0bf26ed... s4:rpc_server/service_rpc.c - fix warnings on Solaris
via c972e6e... s4:rpc_server/service_rpc.c - deactivate the 0-length
struct
from 58715dd... s4:libpolicy - fix printf output specifiers to suppress
warning
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ecbe9a74c6757415720657fbd3ba207989b47848
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Jun 20 22:17:33 2010 +0200
s4:kdc/db-glue.c - remove unreachable code
Would be nice if someone could check if this fits.
commit 05f31c3f6d790f650c2b449c4726521464911777
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Jun 20 22:14:27 2010 +0200
s4:registry/regf.c - add some casts to suppress build warnings on Solaris
commit 2adfe4730362220afe3874b750e71c6e006b310a
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Jun 20 22:06:51 2010 +0200
s4:registry/rpc.c - fix Solaris warnings by casts
commit 2f49c8f58e213e4b8b3f60bb6e02dfc833bb27f3
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Jun 20 22:03:45 2010 +0200
s4:samr RPC server - fix Solaris build warning
commit 871cdec4141e29f377b11fa7a5c177ac7e2dae80
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Jun 20 21:54:50 2010 +0200
s4:registry RPC server - quite some build warnings on Solaris
commit 82fd4837589bbf5918e672669ed30ad300bf3a4a
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Jun 20 21:49:52 2010 +0200
s4:lsa_lookup.c - fix type argument
commit 0bf26edf6c466bfffa87c47b0acb64cc6f4544f7
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Jun 20 21:46:53 2010 +0200
s4:rpc_server/service_rpc.c - fix warnings on Solaris
commit c972e6ec233fc2023b33da0d707ae035f85faba2
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Jun 20 22:32:04 2010 +0200
s4:rpc_server/service_rpc.c - deactivate the 0-length struct
This should fix the build on Solaris
-----------------------------------------------------------------------
Summary of changes:
source4/kdc/db-glue.c | 4 ----
source4/lib/registry/regf.c | 4 ++--
source4/lib/registry/rpc.c | 8 ++++----
source4/rpc_server/lsa/lsa_lookup.c | 2 +-
source4/rpc_server/samr/dcesrv_samr.c | 6 +++---
source4/rpc_server/service_rpc.c | 6 ++++--
source4/rpc_server/winreg/rpc_winreg.c | 8 ++++----
7 files changed, 18 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 97820c0..6e06625 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1125,10 +1125,6 @@ static krb5_error_code
samba_kdc_fetch_krbtgt(krb5_context context,
krb5_warnx(context, "samba_kdc_fetch:
trust_message2entry failed");
}
return ret;
-
-
- /* we should lookup trusted domains */
- return HDB_ERR_NOENTRY;
}
}
diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c
index 176b256..cfbaadd 100644
--- a/source4/lib/registry/regf.c
+++ b/source4/lib/registry/regf.c
@@ -158,7 +158,7 @@ static DATA_BLOB hbin_alloc(struct regf_data *data,
uint32_t size,
uint32_t *offset)
{
DATA_BLOB ret;
- uint32_t rel_offset = -1; /* Relative offset ! */
+ uint32_t rel_offset = (uint32_t) -1; /* Relative offset ! */
struct hbin_block *hbin = NULL;
unsigned int i;
@@ -1775,7 +1775,7 @@ static WERROR regf_set_value(struct hive_key *key, const
char *name,
struct nk_block *nk = private_data->nk;
struct vk_block vk;
uint32_t i;
- uint32_t tmp_vk_offset, vk_offset, old_vk_offset = -1;
+ uint32_t tmp_vk_offset, vk_offset, old_vk_offset = (uint32_t) -1;
DATA_BLOB values;
ZERO_STRUCT(vk);
diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c
index a596fad..7948f7c 100644
--- a/source4/lib/registry/rpc.c
+++ b/source4/lib/registry/rpc.c
@@ -214,12 +214,12 @@ static WERROR rpc_get_value_by_index(TALLOC_CTX *mem_ctx,
r.in.handle = &mykeydata->pol;
r.in.enum_index = n;
r.in.name = &name;
- r.in.type = type;
+ r.in.type = (enum winreg_Type *) type;
r.in.value = &value;
r.in.size = &val_size;
r.in.length = &zero;
r.out.name = &name;
- r.out.type = type;
+ r.out.type = (enum winreg_Type *) type;
r.out.value = &value;
r.out.size = &val_size;
r.out.length = &zero;
@@ -263,11 +263,11 @@ static WERROR rpc_get_value_by_name(TALLOC_CTX *mem_ctx,
ZERO_STRUCT(r);
r.in.handle = &mykeydata->pol;
r.in.value_name = &name;
- r.in.type = type;
+ r.in.type = (enum winreg_Type *) type;
r.in.data = &value;
r.in.data_size = &val_size;
r.in.data_length = &zero;
- r.out.type = type;
+ r.out.type = (enum winreg_Type *) type;
r.out.data = &value;
r.out.data_size = &val_size;
r.out.data_length = &zero;
diff --git a/source4/rpc_server/lsa/lsa_lookup.c
b/source4/rpc_server/lsa/lsa_lookup.c
index f5f0926..7452c73 100644
--- a/source4/rpc_server/lsa/lsa_lookup.c
+++ b/source4/rpc_server/lsa/lsa_lookup.c
@@ -193,7 +193,7 @@ static const struct {
static NTSTATUS lookup_well_known_names(TALLOC_CTX *mem_ctx, const char
*domain,
const char *name, const char
**authority_name,
- struct dom_sid **sid, uint32_t *rtype)
+ struct dom_sid **sid, enum lsa_SidType
*rtype)
{
unsigned int i;
for (i=0; well_known[i].sid; i++) {
diff --git a/source4/rpc_server/samr/dcesrv_samr.c
b/source4/rpc_server/samr/dcesrv_samr.c
index 6b694ed..60109c2 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -1687,7 +1687,7 @@ static NTSTATUS dcesrv_samr_LookupRids(struct
dcesrv_call_state *dce_call, TALLO
struct samr_domain_state *d_state;
const char **names;
struct lsa_String *lsa_names;
- uint32_t *ids;
+ enum lsa_SidType *ids;
ZERO_STRUCTP(r->out.names);
ZERO_STRUCTP(r->out.types);
@@ -1701,7 +1701,7 @@ static NTSTATUS dcesrv_samr_LookupRids(struct
dcesrv_call_state *dce_call, TALLO
lsa_names = talloc_zero_array(mem_ctx, struct lsa_String,
r->in.num_rids);
names = talloc_zero_array(mem_ctx, const char *, r->in.num_rids);
- ids = talloc_zero_array(mem_ctx, uint32_t, r->in.num_rids);
+ ids = talloc_zero_array(mem_ctx, enum lsa_SidType, r->in.num_rids);
if ((lsa_names == NULL) || (names == NULL) || (ids == NULL))
return NT_STATUS_NO_MEMORY;
@@ -1709,7 +1709,7 @@ static NTSTATUS dcesrv_samr_LookupRids(struct
dcesrv_call_state *dce_call, TALLO
r->out.names->names = lsa_names;
r->out.names->count = r->in.num_rids;
- r->out.types->ids = ids;
+ r->out.types->ids = (uint32_t *) ids;
r->out.types->count = r->in.num_rids;
status = dsdb_lookup_rids(d_state->sam_ctx, mem_ctx,
d_state->domain_sid,
diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 87c38fd..8c52c2c 100644
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -90,7 +90,7 @@ static void dcesrv_sock_report_output_data(struct
dcesrv_connection *dce_conn)
substate->call = call;
}
- substate->iov.iov_base = rep->blob.data;
+ substate->iov.iov_base = (void *) rep->blob.data;
substate->iov.iov_len = rep->blob.length;
subreq = tstream_writev_queue_send(substate,
@@ -134,8 +134,10 @@ static void dcesrv_sock_reply_done(struct tevent_req
*subreq)
}
struct dcerpc_read_ncacn_packet_state {
+#if 0
struct {
} caller;
+#endif
DATA_BLOB buffer;
struct ncacn_packet *pkt;
};
@@ -229,7 +231,7 @@ static int dcerpc_read_ncacn_packet_next_vector(struct
tstream_context *stream,
return -1;
}
- vector[0].iov_base = state->buffer.data + ofs;
+ vector[0].iov_base = (void *) (state->buffer.data + ofs);
vector[0].iov_len = state->buffer.length - ofs;
*_vector = vector;
diff --git a/source4/rpc_server/winreg/rpc_winreg.c
b/source4/rpc_server/winreg/rpc_winreg.c
index 575902a..a39a7d1 100644
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -311,11 +311,11 @@ static WERROR dcesrv_winreg_EnumValue(struct
dcesrv_call_state *dce_call,
}
r->out.name->size = r->in.name->size;
- r->out.type = talloc(mem_ctx, uint32_t);
+ r->out.type = talloc(mem_ctx, enum winreg_Type);
if (!r->out.type) {
return WERR_NOMEM;
}
- *r->out.type = data_type;
+ *r->out.type = (enum winreg_Type) data_type;
/* check the client has enough room for the value */
if (r->in.value != NULL &&
@@ -530,11 +530,11 @@ static WERROR dcesrv_winreg_QueryValue(struct
dcesrv_call_state *dce_call,
}
}
- r->out.type = talloc(mem_ctx, uint32_t);
+ r->out.type = talloc(mem_ctx, enum winreg_Type);
if (!r->out.type) {
return WERR_NOMEM;
}
- *r->out.type = value_type;
+ *r->out.type = (enum winreg_Type) value_type;
r->out.data_length = talloc(mem_ctx, uint32_t);
if (!r->out.data_length) {
return WERR_NOMEM;
--
Samba Shared Repository
