X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f0fbf1d670ee13bb461d44ac089ef9ecea267c7f..16edf86595a5a990a942fa045dfb523dae1fe6cb:/batch.c

diff --git a/batch.c b/batch.c
index b1859fc9..940b0c11 100644
--- a/batch.c
+++ b/batch.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) 1999 Weiss
  * Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2007 Wayne Davison
  *
  * 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 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,19 +35,16 @@ extern int always_checksum;
 extern int do_compression;
 extern int def_compress_level;
 extern int protocol_version;
-extern int flist_extra_cnt;
 extern char *batch_name;
 
 extern struct filter_list_struct filter_list;
 
-static int tweaked_preserve_uid;
-static int tweaked_preserve_gid;
 static int tweaked_compress_level;
 
 static int *flag_ptr[] = {
 	&recurse,		/* 0 */
-	&tweaked_preserve_uid,	/* 1 */
-	&tweaked_preserve_gid,	/* 2 */
+	&preserve_uid,		/* 1 */
+	&preserve_gid,		/* 2 */
 	&preserve_links,	/* 3 */
 	&preserve_devices,	/* 4 */
 	&preserve_hard_links,	/* 5 */
@@ -75,8 +71,6 @@ void write_stream_flags(int fd)
 {
 	int i, flags;
 
-	tweaked_preserve_uid = preserve_uid != 0;
-	tweaked_preserve_gid = preserve_gid != 0;
 #if Z_DEFAULT_COMPRESSION == -1
 	tweaked_compress_level = do_compression ? def_compress_level + 2 : 0;
 #else
@@ -118,16 +112,6 @@ void read_stream_flags(int fd)
 			xfer_dirs = 0;
 	}
 
-	if (tweaked_preserve_uid) {
-		if (!preserve_uid)
-			preserve_uid = ++flist_extra_cnt;
-	} else
-		preserve_uid = 0;
-	if (tweaked_preserve_gid) {
-		if (!preserve_gid)
-			preserve_gid = ++flist_extra_cnt;
-	} else
-		preserve_gid = 0;
 	if (tweaked_compress_level == 0 || tweaked_compress_level == 2)
 		do_compression = 0;
 	else {