[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-44-gb7c14af

[Michael Adam]

The branch, v4-0-test has been updated
       via  b7c14af3790bcf825367a7f16d2aaa375b04393c (commit)
       via  ea99590046f50ec2d0c4afe0163fc8660a797ba4 (commit)
       via  3b0917dbc5399dc6835b523d762b244bdcf45b79 (commit)
      from  17c012c4645f4e9542537c15f80d9b4e74304d11 (commit)

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


- Log -----------------------------------------------------------------
commit b7c14af3790bcf825367a7f16d2aaa375b04393c
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 27 09:22:53 2008 +0200

    ldb_map: eliminate "discards qualifyer" warning (const).
    
    Michael

commit ea99590046f50ec2d0c4afe0163fc8660a797ba4
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 27 09:22:11 2008 +0200

    libnet_domain: eliminate "discards qualifier" warning (const).
    
    Michael

commit 3b0917dbc5399dc6835b523d762b244bdcf45b79
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 26 23:30:42 2008 +0200

    dsdb: eliminate disards qualifyer compile warning.
    
    Michael

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

Summary of changes:
 source/dsdb/common/util.c                 |    2 +-
 source/lib/ldb/ldb_map/ldb_map_outbound.c |    2 +-
 source/libnet/libnet_domain.c             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/common/util.c b/source/dsdb/common/util.c
index b981123..a571ae1 100644
--- a/source/dsdb/common/util.c
+++ b/source/dsdb/common/util.c
@@ -1040,7 +1040,7 @@ const struct dom_sid *samdb_domain_sid(struct ldb_context *ldb)
 	}
 
 	/* cache the domain_sid in the ldb */
-	if (ldb_set_opaque(ldb, "cache.domain_sid", domain_sid) != LDB_SUCCESS) {
+	if (ldb_set_opaque(ldb, "cache.domain_sid", discard_const_p(struct dom_sid, domain_sid)) != LDB_SUCCESS) {
 		goto failed;
 	}
 
diff --git a/source/lib/ldb/ldb_map/ldb_map_outbound.c b/source/lib/ldb/ldb_map/ldb_map_outbound.c
index 86661a2..fbc097f 100644
--- a/source/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -195,7 +195,7 @@ static int ldb_msg_replace(struct ldb_message *msg, const struct ldb_message_ele
 		if (ldb_msg_add_empty(msg, el->name, 0, &old) != 0) {
 			return -1;
 		}
-		talloc_free(old->name);
+		talloc_free(discard_const_p(char, old->name));
 	}
 
 	/* copy new element */
diff --git a/source/libnet/libnet_domain.c b/source/libnet/libnet_domain.c
index 6fd3b59..ccdfdaf 100644
--- a/source/libnet/libnet_domain.c
+++ b/source/libnet/libnet_domain.c
@@ -845,7 +845,7 @@ NTSTATUS libnet_DomainCloseSamr_recv(struct composite_context *c, struct libnet_
 		/* domain policy handle closed successfully */
 
 		ZERO_STRUCT(ctx->samr.handle);
-		talloc_free(ctx->samr.name);
+		talloc_free(discard_const_p(char, ctx->samr.name));
 		talloc_free(ctx->samr.sid);
 		ctx->samr.name = NULL;
 		ctx->samr.sid = NULL;


-- 
Samba Shared Repository