summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Flebbe <o.flebbe@science-computing.de>2010-05-11 11:30:04 +0200
committerVolker Lendecke <vl@samba.org>2010-05-12 07:15:07 +0200
commitd5c3db6f8873fc9e1b30f982206f337892cc962f (patch)
tree4e6434118f77892df94b59a636863a99092e19de
parent70f707c2196aa503909678dd891ab4b249f1241e (diff)
downloadsamba-d5c3db6f8873fc9e1b30f982206f337892cc962f.tar.gz
samba-d5c3db6f8873fc9e1b30f982206f337892cc962f.tar.bz2
samba-d5c3db6f8873fc9e1b30f982206f337892cc962f.zip
work around AIX6.1 name space pollution rename mod_name to module_name
-rw-r--r--source3/libnet/libnet_samsync_ldif.c16
-rw-r--r--source4/lib/com/tables.c6
2 files changed, 11 insertions, 11 deletions
diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c
index 931107946e..f18ba5bc33 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 ed21da7cd8..f56e1c3f18 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;