[SCM] Samba Shared Repository - branch master updated - d5a11f9679be9d053838074f1dad5a0ca880750f

[Günther Deschner]

The branch, master has been updated
       via  d5a11f9679be9d053838074f1dad5a0ca880750f (commit)
       via  f97d92ccbc1779f88a76703f2f83db170cf1abaf (commit)
      from  3994c42f1938e35218cd5708fcc5a22b1b9a761d (commit)

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


- Log -----------------------------------------------------------------
commit d5a11f9679be9d053838074f1dad5a0ca880750f
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 00:40:57 2008 +0200

    fix build warnings.
    
    Guenther

commit f97d92ccbc1779f88a76703f2f83db170cf1abaf
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 00:39:37 2008 +0200

    s3: fix the build of registry.so gpext.
    
    Guenther

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

Summary of changes:
 lib/util/xfile.c                |    4 ++--
 source3/libads/ldap.c           |    2 +-
 source3/libgpo/gpext/registry.c |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/xfile.c b/lib/util/xfile.c
index 36d56e5..e8bb811 100644
--- a/lib/util/xfile.c
+++ b/lib/util/xfile.c
@@ -105,7 +105,7 @@ XFILE *x_fopen(const char *fname, int flags, mode_t mode)
 {
 	XFILE *ret;
 
-	ret = malloc_p(XFILE);
+	ret = (XFILE *)malloc_p(XFILE);
 	if (!ret) return NULL;
 
 	memset(ret, 0, sizeof(XFILE));
@@ -403,7 +403,7 @@ XFILE *x_fdup(const XFILE *f)
 		return NULL;
 	}
 
-	ret = malloc_p(XFILE);
+	ret = (XFILE *)malloc_p(XFILE);
 	if (!ret) {
 		close(fd);
 		return NULL;
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index e78465f..fbbe1a5 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -801,7 +801,7 @@ static ADS_STATUS ads_do_paged_search_args(ADS_STRUCT *ads,
 					   int *count, struct berval **cookie)
 {
 	int rc, i, version;
-	char *utf8_expr, *utf8_path, **search_attrs;
+	char *utf8_expr, *utf8_path, **search_attrs = NULL;
 	size_t converted_size;
 	LDAPControl PagedResults, NoReferrals, ExternalCtrl, *controls[4], **rcontrols;
 	BerElement *cookie_be = NULL;
diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c
index 188a48a..f501498 100644
--- a/source3/libgpo/gpext/registry.c
+++ b/source3/libgpo/gpext/registry.c
@@ -410,7 +410,7 @@ static NTSTATUS reg_parse_registry(TALLOC_CTX *mem_ctx,
 		return status;
 	}
 
-	buf = (uint16 *)file_load(real_filename, &n, 0);
+	buf = (uint16 *)file_load(real_filename, &n, 0, NULL);
 	if (!buf) {
 		TALLOC_FREE(reg_file);
 		return NT_STATUS_CANNOT_LOAD_REGISTRY_FILE;
@@ -455,7 +455,7 @@ static NTSTATUS reg_parse_registry(TALLOC_CTX *mem_ctx,
 	status = NT_STATUS_OK;
 
  out:
-	SAFE_FREE(buf);
+	TALLOC_FREE(buf);
 	prs_mem_free(&ps);
 
 	return status;


-- 
Samba Shared Repository