[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  1791d05... s3-samr: Fixed some build warnings.
      from  5f1b120... s3: Fix a ton of type-punned warnings

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


- Log -----------------------------------------------------------------
commit 1791d0533552d9070a72c7e4b827f6b6dd03fae4
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Aug 13 15:56:49 2010 +0200

    s3-samr: Fixed some build warnings.

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

Summary of changes:
 source3/rpc_server/srv_samr_nt.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index e101240..a19be4e 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1795,7 +1795,7 @@ NTSTATUS _samr_LookupNames(struct pipes_struct *p,
 	rids.ids = rid;
 
 	types.count = num_rids;
-	types.ids = type;
+	types.ids = (uint32_t *) type;
 
 	*r->out.rids = rids;
 	*r->out.types = types;
@@ -3413,7 +3413,7 @@ static NTSTATUS query_dom_info_2(TALLOC_CTX *mem_ctx,
 	r->primary.string		= global_myname();
 	r->sequence_num			= seq_num;
 	r->domain_server_state		= DOMAIN_SERVER_ENABLED;
-	r->role				= samr_get_server_role();
+	r->role				= (enum samr_Role) samr_get_server_role();
 	r->unknown3			= 1;
 
 	return NT_STATUS_OK;
@@ -3488,7 +3488,7 @@ static NTSTATUS query_dom_info_6(TALLOC_CTX *mem_ctx,
 static NTSTATUS query_dom_info_7(TALLOC_CTX *mem_ctx,
 				 struct samr_DomInfo7 *r)
 {
-	r->role = samr_get_server_role();
+	r->role = (enum samr_Role) samr_get_server_role();
 
 	return NT_STATUS_OK;
 }


-- 
Samba Shared Repository