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

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  afe139e3272b324df2dec2d4066b351b03792dc8 (commit)
      from  7359f89ded09a0916a42d696a217d3100aab25d2 (commit)

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


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

    Compile error on AIX 6.1

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

Summary of changes:
 source/utils/net_rpc_samsync.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

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