[PATCH 06/26] gpo: remove gpo_filesync.c from source3 folder

abartlet at samba.org abartlet at samba.org
Thu Jun 5 04:07:11 MDT 2014


From: Garming Sam <garming at catalyst.net.nz>

A diff on the file indicates that this file and the one in libgpo are identical.

Signed-off-by: Garming Sam <garming at catalyst.net.nz>
---
 source3/libgpo/gpo_filesync.c | 246 ------------------------------------------
 1 file changed, 246 deletions(-)
 delete mode 100644 source3/libgpo/gpo_filesync.c

diff --git a/source3/libgpo/gpo_filesync.c b/source3/libgpo/gpo_filesync.c
deleted file mode 100644
index 6e3efda..0000000
--- a/source3/libgpo/gpo_filesync.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- *  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, 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;
-	char *mask;
-	uint16_t attribute;
-};
-
-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,
-		       const char *nt_path,
-		       const char *unix_path)
-{
-	NTSTATUS result;
-	uint16_t fnum;
-	int fd = -1;
-	char *data = NULL;
-	static int io_bufsize = 64512;
-	int read_size = io_bufsize;
-	off_t nread = 0;
-
-	result = cli_openx(cli, nt_path, O_RDONLY, DENY_NONE, &fnum);
-	if (!NT_STATUS_IS_OK(result)) {
-		goto out;
-	}
-
-	if ((fd = open(unix_path, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) {
-		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;
-
-		result = cli_read(cli, fnum, data, nread, read_size, &n);
-		if (!NT_STATUS_IS_OK(result)) {
-			goto out;
-		}
-
-		if (n == 0)
-			break;
-
-		if (write(fd, data, n) != n) {
-			break;
-		}
-
-		nread += n;
-	}
-
-	result = NT_STATUS_OK;
-
- out:
-	SAFE_FREE(data);
-	if (fnum) {
-		cli_close(cli, fnum);
-	}
-	if (fd != -1) {
-		close(fd);
-	}
-
-	return result;
-}
-
-/****************************************************************
- copy dir
-****************************************************************/
-
-static NTSTATUS gpo_copy_dir(const char *unix_path)
-{
-	if ((mkdir(unix_path, 0644)) < 0 && errno != EEXIST) {
-		return map_nt_error_from_unix(errno);
-	}
-
-	return NT_STATUS_OK;
-}
-
-/****************************************************************
- sync files
-****************************************************************/
-
-static NTSTATUS gpo_sync_files(struct sync_context *ctx)
-{
-	NTSTATUS status;
-
-	DEBUG(3,("calling cli_list with mask: %s\n", ctx->mask));
-
-	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;
-}
-
-/****************************************************************
- syncronisation call back
-****************************************************************/
-
-static NTSTATUS gpo_sync_func(const char *mnt,
-			  struct file_info *info,
-			  const char *mask,
-			  void *state)
-{
-	NTSTATUS result;
-	struct sync_context *ctx;
-	fstring nt_filename, unix_filename;
-	fstring nt_dir, unix_dir;
-	char *old_nt_dir, *old_unix_dir;
-
-	ctx = (struct sync_context *)state;
-
-	if (strequal(info->name, ".") || strequal(info->name, "..")) {
-		return NT_STATUS_OK;
-	}
-
-	DEBUG(5,("gpo_sync_func: got mask: [%s], name: [%s]\n",
-		mask, info->name));
-
-	if (info->mode & FILE_ATTRIBUTE_DIRECTORY) {
-
-		DEBUG(3,("got dir: [%s]\n", info->name));
-
-		fstrcpy(nt_dir, ctx->remote_path);
-		fstrcat(nt_dir, "\\");
-		fstrcat(nt_dir, info->name);
-
-		fstrcpy(unix_dir, ctx->local_path);
-		fstrcat(unix_dir, "/");
-		fstrcat(unix_dir, info->name);
-
-		result = gpo_copy_dir(unix_dir);
-		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;
-		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);
-
-		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 NT_STATUS_OK;
-	}
-
-	DEBUG(3,("got file: [%s]\n", info->name));
-
-	fstrcpy(nt_filename, ctx->remote_path);
-	fstrcat(nt_filename, "\\");
-	fstrcat(nt_filename, info->name);
-
-	fstrcpy(unix_filename, ctx->local_path);
-	fstrcat(unix_filename, "/");
-	fstrcat(unix_filename, info->name);
-
-	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)));
-	}
-	return result;
-}
-
-
-/****************************************************************
- list a remote directory and download recursivly
-****************************************************************/
-
-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	= 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 gpo_sync_files(&ctx);
-}
-- 
1.9.3



More information about the samba-technical mailing list