=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/ids.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- src/usr.bin/rsync/ids.c 2019/02/21 22:06:26 1.6 +++ src/usr.bin/rsync/ids.c 2019/02/21 22:07:45 1.7 @@ -1,4 +1,4 @@ -/* $Id: ids.c,v 1.6 2019/02/21 22:06:26 benno Exp $ */ +/* $Id: ids.c,v 1.7 2019/02/21 22:07:45 benno Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -52,6 +52,8 @@ { size_t i, j; + assert(!sess->opts->numeric_ids); + for (i = 0; i < flsz; i++) { if (fl[i].st.gid == 0) continue; @@ -72,6 +74,8 @@ { size_t i, j; + assert(!sess->opts->numeric_ids); + for (i = 0; i < flsz; i++) { if (fl[i].st.uid == 0) continue; @@ -99,14 +103,7 @@ struct passwd *usr; int32_t id; - if (sess->opts->numeric_ids) { - for (i = 0; i < idsz; i++) { - assert(ids[i].id != 0); - ids[i].mapped = ids[i].id; - } - LOG4(sess, "did not remap identifiers"); - return; - } + assert(!sess->opts->numeric_ids); for (i = 0; i < idsz; i++) { assert(ids[i].id != 0);