[SCM] Samba Shared Repository - branch master updated

Wed Mar 23 13:13:02 MDT 2011

The branch, master has been updated
       via  d2d3ac6 s3-rpc_client: actually call lsa_open_policy2() in rpccli_lsa_open_policy2().
       via  48c604a s3-smbta-util: fix some buildwarnings.
       via  6c8b820 s3-globals: silence build warning in smbd_messaging_context().
       via  d53aac5 s3-proto: remove some duplicate prototypes.
       via  8fe4a68 s3-includes: remove unused cmdline_lp_ctx.
      from  7f1fd07 s3-epmapper: Log error if we can't register the endpoint.

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


- Log -----------------------------------------------------------------
commit d2d3ac66eccbd5d1141f90b791704acf26f0227e
Author: GÃ¼nther Deschner <gd at samba.org>
Date:   Wed Mar 23 16:47:26 2011 +0100

    s3-rpc_client: actually call lsa_open_policy2() in rpccli_lsa_open_policy2().
    
    Found by Sumit Bose <sbose at redhat.com>, thanks!
    
    Guenther
    
    Autobuild-User: GÃ¼nther Deschner <gd at samba.org>
    Autobuild-Date: Wed Mar 23 20:12:38 CET 2011 on sn-devel-104

commit 48c604a3b72caa79069d3d32b47e0a03090e3687
Author: GÃ¼nther Deschner <gd at samba.org>
Date:   Tue Mar 22 22:02:13 2011 +0100

    s3-smbta-util: fix some buildwarnings.
    
    Guenther

commit 6c8b820b9bf6d50330f23d9da76a143866afbdbd
Author: GÃ¼nther Deschner <gd at samba.org>
Date:   Wed Mar 23 13:00:32 2011 +0100

    s3-globals: silence build warning in smbd_messaging_context().
    
    Guenther

commit d53aac5baa045fe5875d7d32261dde83fec63ac8
Author: GÃ¼nther Deschner <gd at samba.org>
Date:   Wed Mar 23 00:08:13 2011 +0100

    s3-proto: remove some duplicate prototypes.
    
    Guenther

commit 8fe4a68da73f69cb491aa2d79a1d263a8c3069a9
Author: GÃ¼nther Deschner <gd at samba.org>
Date:   Tue Mar 22 23:50:26 2011 +0100

    s3-includes: remove unused cmdline_lp_ctx.
    
    Guenther

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

Summary of changes:
 source3/include/includes.h      |    3 ---
 source3/include/proto.h         |   11 -----------
 source3/rpc_client/cli_lsarpc.c |   13 +++++++------
 source3/smbd/globals.c          |    1 +
 source3/utils/smbta-util.c      |    4 ++--
 5 files changed, 10 insertions(+), 22 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index b1b5dad..7d98cd5 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -517,9 +517,6 @@ enum timestamp_set_resolution {
 typedef char fstring[FSTRING_LEN];
 #endif
 
-/* Samba 3 doesn't use iconv_convenience: */
-extern void *cmdline_lp_ctx;
-
 /* Lists, trees, caching, database... */
 #include "../lib/util/util.h"
 #include "../lib/util/util_net.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0f313d6..2c0f768 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1325,14 +1325,6 @@ ssize_t tstream_read_packet_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 /* The following definitions come from lib/util_str.c  */
 
 bool next_token(const char **ptr, char *buff, const char *sep, size_t bufsize);
-bool next_token_talloc(TALLOC_CTX *ctx,
-			const char **ptr,
-			char **pp_buff,
-			const char *sep);
-bool next_token_no_ltrim_talloc(TALLOC_CTX *ctx,
-			const char **ptr,
-			char **pp_buff,
-			const char *sep);
 int StrCaseCmp(const char *s, const char *t);
 int StrnCaseCmp(const char *s, const char *t, size_t len);
 bool strnequal(const char *s1,const char *s2,size_t n);
@@ -1409,15 +1401,12 @@ int fstr_sprintf(fstring s, const char *fmt, ...);
 bool str_list_sub_basic( char **list, const char *smb_name,
 			 const char *domain_name );
 bool str_list_substitute(char **list, const char *pattern, const char *insert);
-bool str_list_check(const char **list, const char *s);
-bool str_list_check_ci(const char **list, const char *s);
 
 char *ipstr_list_make(char **ipstr_list,
 			const struct ip_service *ip_list,
 			int ip_count);
 int ipstr_list_parse(const char *ipstr_list, struct ip_service **ip_list);
 void ipstr_list_free(char* ipstr_list);
-void rfc1738_unescape(char *buf);
 DATA_BLOB base64_decode_data_blob(const char *s);
 void base64_decode_inplace(char *s);
 char *base64_encode_data_blob(TALLOC_CTX *mem_ctx, DATA_BLOB data);
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 0e87d92..88534e6 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -144,12 +144,13 @@ NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
 	NTSTATUS status;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
-	status = dcerpc_lsa_open_policy(cli->binding_handle,
-					mem_ctx,
-					sec_qos,
-					des_access,
-					pol,
-					&result);
+	status = dcerpc_lsa_open_policy2(cli->binding_handle,
+					 cli->srv_name_slash,
+					 mem_ctx,
+					 sec_qos,
+					 des_access,
+					 pol,
+					 &result);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index ca97884..b1a0d7e 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -121,6 +121,7 @@ struct messaging_context *smbd_messaging_context(void)
 		return msg_ctx;
 	}
 	smb_panic("Could not init smbd's messaging context.\n");
+	return NULL;
 }
 
 struct memcache *smbd_memcache(void)
diff --git a/source3/utils/smbta-util.c b/source3/utils/smbta-util.c
index cf90974..5b08165 100644
--- a/source3/utils/smbta-util.c
+++ b/source3/utils/smbta-util.c
@@ -22,7 +22,7 @@
 static void delete_key(void);
 
 
-static void help()
+static void help(void)
 {
 printf("-h 		print this help message.\n");
 printf("-f <file>	install the key from a file and activate\n");
@@ -34,7 +34,7 @@ printf("-s		check if a key is installed, and print the key to stdout.\n");
 printf("\n");
 }
 
-static void check_key()
+static void check_key(void)
 {	size_t size;
 	char *akey;
 	if (!secrets_init()) {


-- 
Samba Shared Repository
