Only call add_uid() or add_gid() if numeric_ids is not set.

diff --git a/flist.c b/flist.c
index 5044fb5..0aac6b1 100644 (file)
--- 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)) {