Herb's warning fixes. Also the POSIX locking fix.

We now use our own vfs layer to do get/set acl calls (hurrah!).
Jeremy.
(This used to be commit dfe77c7046cbd65ee52aea7439f21503c1eac41d)

4 files changed, 6 insertions, 6 deletions

diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 19e269a323..3517fbbc9c 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -679,7 +679,7 @@ uint32 spoolss_getprinterdata(const POLICY_HND *hnd, const UNISTR2 *valuename,
 
         DEBUG(5,("SPOOLSS Get Printer data)\n"));
 
-        make_spoolss_q_getprinterdata(&q_o, hnd, valuename, in_size);
+        make_spoolss_q_getprinterdata(&q_o, hnd,(UNISTR2 *)valuename, in_size);
 
         /* turn parameters into data stream */
         if (spoolss_io_q_getprinterdata("", &q_o, &buf, 0) &&
diff --git a/source3/rpc_client/cli_use.c b/source3/rpc_client/cli_use.c
index 7cc4477b57..93560e9772 100644
--- a/source3/rpc_client/cli_use.c
+++ b/source3/rpc_client/cli_use.c
@@ -172,7 +172,7 @@ static struct cli_use *cli_find(const char *srv_name,
 		{
 			continue;
 		}
-		if (!reuse && !pwd_compare(&usr_creds->pwd, &c->cli->pwd))
+		if (!reuse && !pwd_compare((struct pwd_info *)&usr_creds->pwd, &c->cli->pwd))
 		{
 			DEBUG(100, ("password doesn't match\n"));
 			continue;
diff --git a/source3/rpc_client/msrpc_spoolss.c b/source3/rpc_client/msrpc_spoolss.c
index a841af82d0..a7a25caaea 100644
--- a/source3/rpc_client/msrpc_spoolss.c
+++ b/source3/rpc_client/msrpc_spoolss.c
@@ -391,7 +391,7 @@ uint32 msrpc_spoolss_getprinterdata( const char* printer_name,
         init_buffer(buffer, size, mem_ctx);
 
         status = spoolss_getprinterdata(&hnd, &uni_val_name, size, type, &size,
-                        data, &needed);
+                        (unsigned char *)data, &needed);
 
         if (status == ERROR_INSUFFICIENT_BUFFER)
         {
@@ -400,7 +400,7 @@ uint32 msrpc_spoolss_getprinterdata( const char* printer_name,
                 data = prs_data_p(&buffer->prs);
                 status = spoolss_getprinterdata(&hnd, &uni_val_name,
                                 size, type, &size,
-                                data, &needed);
+                                (unsigned char *)data, &needed);
         }
 	
 	if (mem_ctx)
diff --git a/source3/rpc_client/ncacn_np_use.c b/source3/rpc_client/ncacn_np_use.c
index 8e5c724046..1a3938b6e9 100644
--- a/source3/rpc_client/ncacn_np_use.c
+++ b/source3/rpc_client/ncacn_np_use.c
@@ -77,7 +77,7 @@ static BOOL ncacn_np_establish_connection(struct ncacn_np *cli,
                 return False;
         }
         /* if (!cli_nt_session_open(cli->smb, pipe_name, &cli->fnum))  by JERRY */
-        if (!cli_nt_session_open(cli->smb, pipe_name))
+        if (!cli_nt_session_open(cli->smb, (char *)pipe_name))
         {
                 cli_net_use_del(srv_name, ntc, False, NULL);
                 return False;
@@ -331,7 +331,7 @@ static struct ncacn_np_use *ncacn_np_find(const char *srv_name,
                         continue;
                 }
                 if (!reuse
-                    && !pwd_compare(&usr_creds->pwd, &c->cli->smb->pwd))
+                    && !pwd_compare((struct pwd_info *)&usr_creds->pwd, &c->cli->smb->pwd))
                 {
                         DEBUG(100, ("password doesn't match\n"));
                         continue;