s3-includes: only include system/filesys.h when needed.

[vlendec/samba-autobuild/.git] / source3 / libgpo / gpo_filesync.c

diff --git a/source3/libgpo/gpo_filesync.c b/source3/libgpo/gpo_filesync.c
index 6d64d7b968ce766b4fbde810d42925db6341cdb5..be964a201e4f2ac3deec6adf351c12880abf211e 100644 (file)
--- a/source3/libgpo/gpo_filesync.c
+++ b/source3/libgpo/gpo_filesync.c
@@ -18,6 +18,9 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "../libgpo/gpo.h"
+#include "libgpo/gpo_proto.h"
 
 struct sync_context {
        TALLOC_CTX *mem_ctx;
@@ -28,8 +31,8 @@ struct sync_context {
        uint16_t attribute;
 };
 
-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);
 
@@ -39,15 +42,15 @@ NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
                       const char *unix_path)
 {
        NTSTATUS result;
-       int fnum;
-       int fd = 0;
+       uint16_t fnum;
+       int fd = -1;
        char *data = NULL;
        static int io_bufsize = 64512;
        int read_size = io_bufsize;
        off_t nread = 0;
 
-       if ((fnum = cli_open(cli, nt_path, O_RDONLY, DENY_NONE)) == -1) {
-               result = NT_STATUS_NO_SUCH_FILE;
+       result = cli_open(cli, nt_path, O_RDONLY, DENY_NONE, &fnum);
+       if (!NT_STATUS_IS_OK(result)) {
                goto out;
        }
 
@@ -82,7 +85,7 @@ NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
        if (fnum) {
                cli_close(cli, fnum);
        }
-       if (fd) {
+       if (fd != -1) {
                close(fd);
        }
 
@@ -96,7 +99,7 @@ NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
 static NTSTATUS gpo_copy_dir(const char *unix_path)
 {
        if ((mkdir(unix_path, 0644)) < 0 && errno != EEXIST) {
-               return NT_STATUS_ACCESS_DENIED;
+               return map_nt_error_from_unix(errno);
        }
 
        return NT_STATUS_OK;
@@ -106,29 +109,29 @@ static NTSTATUS gpo_copy_dir(const char *unix_path)
  sync files
 ****************************************************************/
 
-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;
+       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 true;
+       return status;
 }
 
 /****************************************************************
  syncronisation call back
 ****************************************************************/
 
-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)
 {
@@ -141,7 +144,7 @@ static void gpo_sync_func(const char *mnt,
        ctx = (struct sync_context *)state;
 
        if (strequal(info->name, ".") || strequal(info->name, "..")) {
-               return;
+               return NT_STATUS_OK;
        }
 
        DEBUG(5,("gpo_sync_func: got mask: [%s], name: [%s]\n",
@@ -163,6 +166,7 @@ static void gpo_sync_func(const char *mnt,
                if (!NT_STATUS_IS_OK(result)) {
                        DEBUG(1,("failed to copy dir: %s\n",
                                nt_errstr(result)));
+                       return result;
                }
 
                old_nt_dir = ctx->remote_path;
@@ -176,15 +180,17 @@ static void gpo_sync_func(const char *mnt,
                                        nt_dir);
                if (!ctx->local_path || !ctx->mask || !ctx->remote_path) {
                        DEBUG(0,("gpo_sync_func: ENOMEM\n"));
-                       return;
+                       return NT_STATUS_NO_MEMORY;
                }
-               if (!gpo_sync_files(ctx)) {
+               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;
        }
 
        DEBUG(3,("got file: [%s]\n", info->name));
@@ -203,6 +209,7 @@ static void gpo_sync_func(const char *mnt,
                DEBUG(1,("failed to copy file: %s\n",
                        nt_errstr(result)));
        }
+       return result;
 }
 
 
@@ -230,9 +237,5 @@ NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!gpo_sync_files(&ctx)) {
-               return NT_STATUS_NO_SUCH_FILE;
-       }
-
-       return NT_STATUS_OK;
+       return gpo_sync_files(&ctx);
 }