X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7c73536c25744a5e38027ec373a4cc26f4a681c4..8e41b68e8f975c02a5d9281be780ba5d1a385107:/log.c

diff --git a/log.c b/log.c
index cd5cd843..06b5ae37 100644
--- a/log.c
+++ b/log.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-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 version 2 as
- * published by the Free Software Foundation.
+ * 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
@@ -15,8 +16,7 @@
  * 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -34,8 +34,8 @@ extern int msg_fd_out;
 extern int allow_8bit_chars;
 extern int protocol_version;
 extern int preserve_times;
-extern int preserve_uid;
-extern int preserve_gid;
+extern int uid_ndx;
+extern int gid_ndx;
 extern int stdout_format_has_i;
 extern int stdout_format_has_o_or_i;
 extern int logfile_format_has_i;
@@ -484,11 +484,11 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 		case 'U':
 			strlcat(fmt, "u", sizeof fmt);
 			snprintf(buf2, sizeof buf2, fmt,
-				 preserve_uid ? F_OWNER(file) : 0);
+				 uid_ndx ? F_OWNER(file) : 0);
 			n = buf2;
 			break;
 		case 'G':
-			if (!preserve_gid || file->flags & FLAG_SKIP_GROUP)
+			if (!gid_ndx || file->flags & FLAG_SKIP_GROUP)
 				n = "DEFAULT";
 			else {
 				strlcat(fmt, "u", sizeof fmt);