From 9f7b8c3b8f96c8f273af11258b92e0b03adc602a Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 5 Feb 2004 00:44:11 +0000
Subject: [PATCH] Only call add_uid() or add_gid() if numeric_ids is not set.

---
 flist.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/flist.c b/flist.c
index 5044fb53..0aac6b17 100644
--- a/flist.c
+++ b/flist.c
@@ -435,11 +435,13 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	if (!(flags & XMIT_SAME_MODE))
 		write_int(f, to_wire_mode(mode));
 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
-		add_uid(uid);
+		if (!numeric_ids)
+			add_uid(uid);
 		write_int(f, uid);
 	}
 	if (preserve_gid && !(flags & XMIT_SAME_GID)) {
-		add_gid(gid);
+		if (!numeric_ids)
+			add_gid(gid);
 		write_int(f, gid);
 	}
 	if (preserve_devices && IS_DEVICE(mode)) {
-- 
2.34.1