summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-08-01 15:34:52 +0200
committerGünther Deschner <gd@samba.org>2010-08-02 12:05:03 +0200
commit322b52419485b882658c53c21f86e5bdfa82b71f (patch)
tree1a9ea04af19368c432c34f22106ab7346652bff7 /source3
parent911db761148329f3bfc84ee68e0747215d0e8b2d (diff)
downloadsamba-322b52419485b882658c53c21f86e5bdfa82b71f.tar.gz
samba-322b52419485b882658c53c21f86e5bdfa82b71f.tar.bz2
samba-322b52419485b882658c53c21f86e5bdfa82b71f.zip
s3-build: fix some c++ build warnings.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/librpc/rpc/dcerpc_gssapi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/librpc/rpc/dcerpc_gssapi.c b/source3/librpc/rpc/dcerpc_gssapi.c
index c9496ab290..2de46b5752 100644
--- a/source3/librpc/rpc/dcerpc_gssapi.c
+++ b/source3/librpc/rpc/dcerpc_gssapi.c
@@ -310,7 +310,7 @@ static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32 maj, OM_uint32 min)
goto done;
}
gss_maj = gss_display_status(&gss_min, min, GSS_C_MECH_CODE,
- discard_const(gss_mech_krb5),
+ (gss_OID)discard_const(gss_mech_krb5),
&msg_ctx, &msg_min);
if (gss_maj) {
goto done;
@@ -394,7 +394,7 @@ NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
if (!signature->length) {
return NT_STATUS_INTERNAL_ERROR;
}
- signature->data = talloc_size(mem_ctx, signature->length);
+ signature->data = (uint8_t *)talloc_size(mem_ctx, signature->length);
if (!signature->data) {
return NT_STATUS_NO_MEMORY;
}