s3: piddir creation fix part 2.
[ira/wip.git] / source3 / libgpo / gpo_filesync.c
index a668fa189100374227c67deab7eba9cc3cf0c5bb..7f0e4107d6c7fcf1cd5d3bbfd9d45993a1949942 100644 (file)
@@ -1,38 +1,41 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  Group Policy Object Support
  *  Copyright (C) Guenther Deschner 2006
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "libsmb/libsmb.h"
+#include "../libgpo/gpo.h"
+#include "libgpo/gpo_proto.h"
 
 struct sync_context {
        TALLOC_CTX *mem_ctx;
        struct cli_state *cli;
        char *remote_path;
        char *local_path;
-       pstring mask;
-       uint16 attribute;
+       char *mask;
+       uint16_t attribute;
 };
 
-static void gpo_sync_func(const char *mnt,
-                          file_info *info,
-                          const char *mask,
-                          void *state);
+static NTSTATUS gpo_sync_func(const char *mnt,
+                         struct file_info *info,
+                         const char *mask,
+                         void *state);
 
 NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
                       struct cli_state *cli,
@@ -40,16 +43,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 start = 0;
        off_t nread = 0;
 
-       if ((fnum = cli_open(cli, nt_path, O_RDONLY, DENY_NONE)) == -1) {
-               result = NT_STATUS_NO_SUCH_FILE;
+       result = cli_openx(cli, nt_path, O_RDONLY, DENY_NONE, &fnum);
+       if (!NT_STATUS_IS_OK(result)) {
                goto out;
        }
 
@@ -57,17 +59,21 @@ NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
                result = map_nt_error_from_unix(errno);
                goto out;
        }
-        
+
        if ((data = (char *)SMB_MALLOC(read_size)) == NULL) {
                result = NT_STATUS_NO_MEMORY;
                goto out;
        }
 
        while (1) {
+               size_t n = 0;
 
-               int n = cli_read(cli, fnum, data, nread + start, read_size);
+               result = cli_read(cli, fnum, data, nread, read_size, &n);
+               if (!NT_STATUS_IS_OK(result)) {
+                       goto out;
+               }
 
-               if (n <= 0)
+               if (n == 0)
                        break;
 
                if (write(fd, data, n) != n) {
@@ -84,7 +90,7 @@ NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
        if (fnum) {
                cli_close(cli, fnum);
        }
-       if (fd) {
+       if (fd != -1) {
                close(fd);
        }
 
@@ -98,7 +104,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;
@@ -108,25 +114,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)
 {
@@ -139,13 +149,13 @@ 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", 
+       DEBUG(5,("gpo_sync_func: got mask: [%s], name: [%s]\n",
                mask, info->name));
 
-       if (info->mode & aDIR) {
+       if (info->mode & FILE_ATTRIBUTE_DIRECTORY) {
 
                DEBUG(3,("got dir: [%s]\n", info->name));
 
@@ -159,25 +169,33 @@ static void gpo_sync_func(const char *mnt,
 
                result = gpo_copy_dir(unix_dir);
                if (!NT_STATUS_IS_OK(result)) {
-                       DEBUG(1,("failed to copy dir: %s\n", nt_errstr(result)));
+                       DEBUG(1,("failed to copy dir: %s\n",
+                               nt_errstr(result)));
+                       return result;
                }
 
                old_nt_dir = ctx->remote_path;
-               ctx->remote_path = nt_dir;
-               
+               ctx->remote_path = talloc_strdup(ctx->mem_ctx, nt_dir);
+
                old_unix_dir = ctx->local_path;
                ctx->local_path = talloc_strdup(ctx->mem_ctx, unix_dir);
 
-               pstrcpy(ctx->mask, nt_dir);
-               pstrcat(ctx->mask, "\\*");
-
-               if (!gpo_sync_files(ctx)) {
+               ctx->mask = talloc_asprintf(ctx->mem_ctx,
+                                       "%s\\*",
+                                       nt_dir);
+               if (!ctx->local_path || !ctx->mask || !ctx->remote_path) {
+                       DEBUG(0,("gpo_sync_func: ENOMEM\n"));
+                       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;
        }
 
        DEBUG(3,("got file: [%s]\n", info->name));
@@ -190,10 +208,13 @@ static void gpo_sync_func(const char *mnt,
        fstrcat(unix_filename, "/");
        fstrcat(unix_filename, info->name);
 
-       result = gpo_copy_file(ctx->mem_ctx, ctx->cli, nt_filename, unix_filename);
+       result = gpo_copy_file(ctx->mem_ctx, ctx->cli,
+                              nt_filename, unix_filename);
        if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(1,("failed to copy file: %s\n", nt_errstr(result)));
+               DEBUG(1,("failed to copy file: %s\n",
+                       nt_errstr(result)));
        }
+       return result;
 }
 
 
@@ -201,25 +222,25 @@ static void gpo_sync_func(const char *mnt,
  list a remote directory and download recursivly
 ****************************************************************/
 
-NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx, 
-                             struct cli_state *cli, 
-                             const char *nt_path, 
+NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx,
+                             struct cli_state *cli,
+                             const char *nt_path,
                              const char *local_path)
 {
        struct sync_context ctx;
 
        ctx.mem_ctx     = mem_ctx;
        ctx.cli         = cli;
-       ctx.remote_path = CONST_DISCARD(char *, nt_path);
-       ctx.local_path  = CONST_DISCARD(char *, local_path);
-       ctx.attribute   = (aSYSTEM | aHIDDEN | aDIR);
-
-       pstrcpy(ctx.mask, nt_path);
-       pstrcat(ctx.mask, "\\*");
-
-       if (!gpo_sync_files(&ctx)) {
-               return NT_STATUS_NO_SUCH_FILE;
+       ctx.remote_path = discard_const_p(char, nt_path);
+       ctx.local_path  = discard_const_p(char, local_path);
+       ctx.attribute   = (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY);
+
+       ctx.mask = talloc_asprintf(mem_ctx,
+                               "%s\\*",
+                               nt_path);
+       if (!ctx.mask) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       return NT_STATUS_OK;
+       return gpo_sync_files(&ctx);
 }