Changeset 745 for trunk/server/source3/libgpo/gpo_filesync.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libgpo/gpo_filesync.c (modified) (12 diffs)

trunk/server/source3/libgpo/gpo_filesync.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "libsmb/libsmb.h"
+#include "../libgpo/gpo.h"
+#include "libgpo/gpo_proto.h"
 
 struct sync_context {
@@ -29 +33 @@
 };
 
-static void gpo_sync_func(const char *mnt,
-                          file_info *info,
+static NTSTATUS gpo_sync_func(const char *mnt,
+                          struct file_info *info,
                           const char *mask,
                           void *state);
@@ -97 +101 @@
 {
         if ((mkdir(unix_path, 0644)) < 0 && errno != EEXIST) {
-                return NT_STATUS_ACCESS_DENIED;
+                return map_nt_error_from_unix(errno);
         }
 
@@ -107 +111 @@
 ****************************************************************/
 
-static bool gpo_sync_files(struct sync_context *ctx)
-{
+static NTSTATUS gpo_sync_files(struct sync_context *ctx)
+{
+        NTSTATUS status;
+
         DEBUG(3,("calling cli_list with mask: %s\n", ctx->mask));
 
-        if (cli_list(ctx->cli,
-                     ctx->mask,
-                     ctx->attribute,
-                     gpo_sync_func,
-                     ctx) == -1) {
-                DEBUG(1,("listing [%s] failed with error: %s\n",
-                        ctx->mask, cli_errstr(ctx->cli)));
-                return false;
-        }
-
-        return true;
+        status = cli_list(ctx->cli, ctx->mask, ctx->attribute, gpo_sync_func,
+                          ctx);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(1, ("listing [%s] failed with error: %s\n",
+                          ctx->mask, nt_errstr(status)));
+                return status;
+        }
+
+        return status;
 }
 
@@ -128 +132 @@
 ****************************************************************/
 
-static void gpo_sync_func(const char *mnt,
-                          file_info *info,
+static NTSTATUS gpo_sync_func(const char *mnt,
+                          struct file_info *info,
                           const char *mask,
                           void *state)
@@ -142 +146 @@
 
         if (strequal(info->name, ".") || strequal(info->name, "..")) {
-                return;
+                return NT_STATUS_OK;
         }
 
@@ -148 +152 @@
                 mask, info->name));
 
-        if (info->mode & aDIR) {
+        if (info->mode & FILE_ATTRIBUTE_DIRECTORY) {
 
                 DEBUG(3,("got dir: [%s]\n", info->name));
@@ -164 +168 @@
                         DEBUG(1,("failed to copy dir: %s\n",
                                 nt_errstr(result)));
+                        return result;
                 }
 
@@ -177 +182 @@
                 if (!ctx->local_path || !ctx->mask || !ctx->remote_path) {
                         DEBUG(0,("gpo_sync_func: ENOMEM\n"));
-                        return;
-                }
-                if (!gpo_sync_files(ctx)) {
+                        return NT_STATUS_NO_MEMORY;
+                }
+                result = gpo_sync_files(ctx);
+                if (!NT_STATUS_IS_OK(result)) {
                         DEBUG(0,("could not sync files\n"));
+                        return result;
                 }
 
                 ctx->remote_path = old_nt_dir;
                 ctx->local_path = old_unix_dir;
-                return;
+                return NT_STATUS_OK;
         }
 
@@ -204 +211 @@
                         nt_errstr(result)));
         }
+        return result;
 }
 
@@ -222 +230 @@
         ctx.remote_path = CONST_DISCARD(char *, nt_path);
         ctx.local_path  = CONST_DISCARD(char *, local_path);
-        ctx.attribute   = (aSYSTEM | aHIDDEN | aDIR);
+        ctx.attribute   = (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY);
 
         ctx.mask = talloc_asprintf(mem_ctx,
@@ -231 +239 @@
         }
 
-        if (!gpo_sync_files(&ctx)) {
-                return NT_STATUS_NO_SUCH_FILE;
-        }
-
-        return NT_STATUS_OK;
-}
+        return gpo_sync_files(&ctx);
+}