Attachment 5695 Details for Bug 7421 – Patch for master/3.5

[patch] Patch for master/3.5

0001-work-around-AIX6.1-name-space-pollution-rename-mod_n.patch (text/plain), 2.82 KB, created by Volker Lendecke on 2010-05-11 08:12:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2010-05-11 08:12:04 UTC

Size: 2.82 KB

patch

obsolete

>From 09f8f568567a42c27a39bec272725aae0332560e Mon Sep 17 00:00:00 2001
>From: Olaf Flebbe <o.flebbe@science-computing.de>
>Date: Tue, 11 May 2010 11:30:04 +0200
>Subject: [PATCH] work around AIX6.1 name space pollution rename mod_name to module_name
>
>---
> source3/libnet/libnet_samsync_ldif.c |   16 ++++++++--------
> source4/lib/com/tables.c             |    6 +++---
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c
>index 9311079..f18ba5b 100644
>--- a/source3/libnet/libnet_samsync_ldif.c
>+++ b/source3/libnet/libnet_samsync_ldif.c
>@@ -57,7 +57,7 @@ struct samsync_ldif_context {
> 	const char *add_template;
> 	const char *mod_template;
> 	char *add_name;
>-	char *mod_name;
>+	char *module_name;
> 	FILE *add_file;
> 	FILE *mod_file;
> 	FILE *ldif_file;
>@@ -941,8 +941,8 @@ static NTSTATUS ldif_init_context(TALLOC_CTX *mem_ctx,
> 	}
> 
> 	r->add_name = talloc_strdup(mem_ctx, add_template);
>-	r->mod_name = talloc_strdup(mem_ctx, mod_template);
>-	if (!r->add_name || !r->mod_name) {
>+	r->module_name = talloc_strdup(mem_ctx, mod_template);
>+	if (!r->add_name || !r->module_name) {
> 		status = NT_STATUS_NO_MEMORY;
> 		goto done;
> 	}
>@@ -953,8 +953,8 @@ static NTSTATUS ldif_init_context(TALLOC_CTX *mem_ctx,
> 		status = NT_STATUS_UNSUCCESSFUL;
> 		goto done;
> 	}
>-	if (!(r->mod_file = fdopen(mkstemp(r->mod_name),"w"))) {
>-		DEBUG(1, ("Could not open %s\n", r->mod_name));
>+	if (!(r->mod_file = fdopen(mkstemp(r->module_name),"w"))) {
>+		DEBUG(1, ("Could not open %s\n", r->module_name));
> 		status = NT_STATUS_UNSUCCESSFUL;
> 		goto done;
> 	}
>@@ -1027,10 +1027,10 @@ static void ldif_free_context(struct samsync_ldif_context *r)
> 		fclose(r->mod_file);
> 	}
> 
>-	if ((r->mod_name != NULL) &&
>-	    strcmp(r->mod_name, r->mod_template) && (unlink(r->mod_name))) {
>+	if ((r->module_name != NULL) &&
>+	    strcmp(r->module_name, r->mod_template) && (unlink(r->module_name))) {
> 		DEBUG(1,("unlink(%s) failed, error was (%s)\n",
>-			 r->mod_name, strerror(errno)));
>+			 r->module_name, strerror(errno)));
> 	}
> 
> 	if (r->ldif_file && (r->ldif_file != stdout)) {
>diff --git a/source4/lib/com/tables.c b/source4/lib/com/tables.c
>index ed21da7..f56e1c3 100644
>--- a/source4/lib/com/tables.c
>+++ b/source4/lib/com/tables.c
>@@ -51,16 +51,16 @@ static struct IUnknown *get_com_class_running(const struct GUID *clsid)
> 
> static struct IUnknown *get_com_class_so(TALLOC_CTX *mem_ctx, const struct GUID *clsid)
> {
>-	char *mod_name;
>+	char *module_name;
> 	char *clsid_str;
> 	void *mod;
> 	get_class_object_function f;
> 
> 	clsid_str = GUID_string(mem_ctx, clsid);
>-	mod_name = talloc_asprintf(mem_ctx, "%s.so", clsid_str);
>+	module_name = talloc_asprintf(mem_ctx, "%s.so", clsid_str);
> 	talloc_free(clsid_str);
> 
>-	mod = dlopen(mod_name, 0);
>+	mod = dlopen(module_name, 0);
> 
> 	if (!mod) {
> 		return NULL;
>-- 
>1.6.0.4
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 7421: 5693 | 5694 | 5695