[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  322b524... s3-build: fix some c++ build warnings.
      from  911db76... s3: Use cups-config --libs

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 322b52419485b882658c53c21f86e5bdfa82b71f
Author: Günther Deschner <gd at samba.org>
Date:   Sun Aug 1 15:34:52 2010 +0200

    s3-build: fix some c++ build warnings.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/librpc/rpc/dcerpc_gssapi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/rpc/dcerpc_gssapi.c b/source3/librpc/rpc/dcerpc_gssapi.c
index c9496ab..2de46b5 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;
 	}


-- 
Samba Shared Repository