Changeset 480 for trunk/server/source3/libnet

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libnet/libnet_samsync_ldif.c (modified) (4 diffs)

trunk/server/source3/libnet/libnet_samsync_ldif.c

@@ -58 +58 @@
         const char *mod_template;
         char *add_name;
-        char *mod_name;
+        char *module_name;
         FILE *add_file;
         FILE *mod_file;
@@ -942 +942 @@
 
         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;
@@ -954 +954 @@
                 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;
@@ -1028 +1028 @@
         }
 
-        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)));
         }