[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0-110-g5915ec8

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  5915ec88a2b704d0970902d9716570037bf0a3e2 (commit)
       via  a794e5f1907cf8c948b2f451411f91ea0c146e97 (commit)
      from  5d5e171ecc1e7f61f5d5ce2449fb5abd6d3b8f44 (commit)

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


- Log -----------------------------------------------------------------
commit 5915ec88a2b704d0970902d9716570037bf0a3e2
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Aug 5 08:21:13 2008 +0200

    WHATSNEW: Update changes since 3.2.0.
    
    Karolin
    (cherry picked from commit bdbc8f821063df8f612b83ce6c903270fa985cbf)

commit a794e5f1907cf8c948b2f451411f91ea0c146e97
Author: Yannick Bergeron <yaberger at ca.ibm.com>
Date:   Mon Aug 4 13:21:02 2008 -0400

    Compile error on AIX 6.1
    (cherry picked from commit afe139e3272b324df2dec2d4066b351b03792dc8)

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

Summary of changes:
 WHATSNEW.txt                   |    4 ++++
 source/utils/net_rpc_samsync.c |   16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index befa12f..20b3ad2 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -47,6 +47,10 @@ o   Jeremy Allison <jra at samba.org>
     * Fix uninitialized variable.
 
 
+o   Yannick Bergeron <yaberger at ca.ibm.com>
+    * Fix compile error on AIX 6.1
+
+
 o   Jim Brown <jim.brown at miami.edu>
     * Fix SGI compiler warnings.
 
diff --git a/source/utils/net_rpc_samsync.c b/source/utils/net_rpc_samsync.c
index 38852b1..13a7bce 100644
--- a/source/utils/net_rpc_samsync.c
+++ b/source/utils/net_rpc_samsync.c
@@ -2019,7 +2019,7 @@ static NTSTATUS fetch_database_to_ldif(struct rpc_pipe_client *pipe_hnd,
 {
 	char *suffix;
 	const char *builtin_sid = "S-1-5-32";
-	char *add_name = NULL, *mod_name = NULL;
+	char *add_name = NULL, *mod_filename = NULL;
 	const char *add_template = "/tmp/add.ldif.XXXXXX";
 	const char *mod_template = "/tmp/mod.ldif.XXXXXX";
 	fstring sid, domainname;
@@ -2064,8 +2064,8 @@ static NTSTATUS fetch_database_to_ldif(struct rpc_pipe_client *pipe_hnd,
 	}
 
 	add_name = talloc_strdup(mem_ctx, add_template);
-	mod_name = talloc_strdup(mem_ctx, mod_template);
- 	if (!add_name || !mod_name) {
+	mod_filename = talloc_strdup(mem_ctx, mod_template);
+	if (!add_name || !mod_filename) {
 		ret = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
@@ -2076,8 +2076,8 @@ static NTSTATUS fetch_database_to_ldif(struct rpc_pipe_client *pipe_hnd,
 		ret = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
-	if (!(mod_file = fdopen(smb_mkstemp(mod_name),"w"))) {
-		DEBUG(1, ("Could not open %s\n", mod_name));
+	if (!(mod_file = fdopen(smb_mkstemp(mod_filename),"w"))) {
+		DEBUG(1, ("Could not open %s\n", mod_filename));
 		ret = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
@@ -2315,10 +2315,10 @@ static NTSTATUS fetch_database_to_ldif(struct rpc_pipe_client *pipe_hnd,
 		fclose(mod_file);
 	}
 
-	if ((mod_name != NULL) &&
-	    strcmp(mod_name, mod_template) && (unlink(mod_name))) {
+	if ((mod_filename != NULL) &&
+	    strcmp(mod_filename, mod_template) && (unlink(mod_filename))) {
 		DEBUG(1,("unlink(%s) failed, error was (%s)\n",
-			 mod_name, strerror(errno)));
+			 mod_filename, strerror(errno)));
 	}
 
 	if (ldif_file && (ldif_file != stdout)) {


-- 
Samba Shared Repository