[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2598-g3b1dae7

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  3b1dae7c31b881834ca4494c4434ae97a56ce6c7 (commit)
       via  194ea682d9a5c12a0125fecc20349ca9cc3d3ea1 (commit)
       via  d893b2ea13d2e64f1c13aa3984f77baa91a2c658 (commit)
       via  2dbbd81677af9c470ee9370ca5414876d21c6b9b (commit)
      from  344d69f95e217d16213eaa6b53141af6ab459708 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 3b1dae7c31b881834ca4494c4434ae97a56ce6c7
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 25 13:51:14 2008 +0200

    Fix two c++ warnings

commit 194ea682d9a5c12a0125fecc20349ca9cc3d3ea1
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 25 13:44:59 2008 +0200

    Fix two bogus uninitalized variable warnings

commit d893b2ea13d2e64f1c13aa3984f77baa91a2c658
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 25 13:44:35 2008 +0200

    Fix a const warning
    
    Jelmer, would it be possible to make the rpc client functions take const
    pointers for pure [in] arguments?

commit 2dbbd81677af9c470ee9370ca5414876d21c6b9b
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 25 13:36:46 2008 +0200

    Move ber_[read|write]_OID_String protypes to proto.h

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

Summary of changes:
 source/include/proto.h           |    2 ++
 source/librpc/ndr/ndr_drsuapi.c  |    3 ---
 source/libsmb/dsgetdcname.c      |    3 ++-
 source/rpc_client/cli_pipe.c     |    3 ++-
 source/winbindd/winbindd_async.c |    2 +-
 source/winbindd/winbindd_group.c |    3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index afce9ae..3d72022 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -4202,6 +4202,8 @@ bool asn1_read_OctetString(ASN1_DATA *data, DATA_BLOB *blob);
 bool asn1_read_Integer(ASN1_DATA *data, int *i);
 bool asn1_check_enumerated(ASN1_DATA *data, int v);
 bool asn1_write_enumerated(ASN1_DATA *data, uint8 v);
+bool ber_write_OID_String(DATA_BLOB *blob, const char *OID);
+bool ber_read_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB blob, const char **OID);
 
 /* The following definitions come from libsmb/async_smb.c  */
 
diff --git a/source/librpc/ndr/ndr_drsuapi.c b/source/librpc/ndr/ndr_drsuapi.c
index 3c15e01..f12ac0b 100644
--- a/source/librpc/ndr/ndr_drsuapi.c
+++ b/source/librpc/ndr/ndr_drsuapi.c
@@ -24,9 +24,6 @@
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 
-bool ber_write_OID_String(DATA_BLOB *blob, const char *OID);
-bool ber_read_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB blob, const char **OID);
-
 void ndr_print_drsuapi_DsReplicaObjectListItem(struct ndr_print *ndr, const char *name,
 					       const struct drsuapi_DsReplicaObjectListItem *r)
 {
diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index d57689c..be38db1 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -920,7 +920,8 @@ static NTSTATUS make_dc_info_from_cldap_reply(TALLOC_CTX *mem_ctx,
 					      union nbt_cldap_netlogon *r,
 					      struct netr_DsRGetDCNameInfo **info)
 {
-	const char *dc_hostname, *dc_domain_name;
+	const char *dc_hostname = NULL;
+	const char *dc_domain_name = NULL;
 	const char *dc_address = NULL;
 	const char *dc_forest = NULL;
 	uint32_t dc_address_type = 0;
diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index cec2797..8ba79d3 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -2654,7 +2654,8 @@ static NTSTATUS rpc_pipe_get_tcp_port(const char *host,
 
 	status = rpccli_epm_Map(epm_pipe,
 				tmp_ctx,
-				&(abstract_syntax->uuid),
+				CONST_DISCARD(struct GUID *,
+					      &(abstract_syntax->uuid)),
 				map_tower,
 				entry_handle,
 				max_towers,
diff --git a/source/winbindd/winbindd_async.c b/source/winbindd/winbindd_async.c
index 635bc6b..bc0f9d8 100644
--- a/source/winbindd/winbindd_async.c
+++ b/source/winbindd/winbindd_async.c
@@ -468,7 +468,7 @@ static void listgroups_recv(TALLOC_CTX *mem_ctx, bool success,
 	}
 
 	cont(private_data, True, response->data.name.dom_name,
-	     response->extra_data.data);
+	     (char *)response->extra_data.data);
 
 	SAFE_FREE(response->extra_data.data);
 }
diff --git a/source/winbindd/winbindd_group.c b/source/winbindd/winbindd_group.c
index dd2fc6f..d10609a 100644
--- a/source/winbindd/winbindd_group.c
+++ b/source/winbindd/winbindd_group.c
@@ -1412,7 +1412,8 @@ static void listgroups_recv(void *private_data, bool success, fstring dom_name,
 {
 	/* extra_data comes to us as a '\0' terminated string of comma
 	   separated groups */
-	struct listgroups_state *state = private_data;
+	struct listgroups_state *state = talloc_get_type_abort(
+		private_data, struct listgroups_state);
 
 	/* Append groups from one domain onto the whole list */
 	if (extra_data) {


-- 
Samba Shared Repository