Fix handling of skipped elements on the very first element transmitted.
rsync compares e.g. the first mtime against 0, if the mtime is the epoch
then rsync will skip this field and openrsync will choke when receiving it.
So if there is no first element but a FLIST_XYZ_SAME flag is use 0 as
value.
Problem noticed by job@
OK tb@ job@ and yoda@ for fixing the if statements

spelling fixes; from paul tagliamonte
amendments to his diff are noted on tech

whitespace observed during a read-through

When reading the symlink value during the fts travers use ent->fts_accpath
since the fts traverse does chdirs for performance reasons.
OK deraadt@

branches: 1.34.2;
remove sys/param.h that snuck in, by replacing MAXPATHLEN with PATH_MAX

Implement --exclude/exclude-file and --include/include-file.
Currently only simple include and excludes work, the advanced filters
introduced later in rsync are not implemented. It is unclear if the per
directory filters are something we want to implement. This requires
more modern protocols which openrsync is not able to handle right now.

This adds a special matching function to allow the ** matching which behaves
mostly like rsyncs version with the exception of how bad [] patterns are
expanded. For bad patterns openrsync follows more how fnmatch behaves and
not the somewhat strange rsync behaviour.

Not perfect but committing now so people can test and provide feedback.

Replace Id: tags with OpenBSD: tags
OK deraadt@

branches: 1.31.2;
Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

spelling fixes; from paul tagliamonte
amendments to his diff are noted on tech

whitespace observed during a read-through

When reading the symlink value during the fts travers use ent->fts_accpath
since the fts traverse does chdirs for performance reasons.
OK deraadt@

branches: 1.34.2;
remove sys/param.h that snuck in, by replacing MAXPATHLEN with PATH_MAX

Implement --exclude/exclude-file and --include/include-file.
Currently only simple include and excludes work, the advanced filters
introduced later in rsync are not implemented. It is unclear if the per
directory filters are something we want to implement. This requires
more modern protocols which openrsync is not able to handle right now.

This adds a special matching function to allow the ** matching which behaves
mostly like rsyncs version with the exception of how bad [] patterns are
expanded. For bad patterns openrsync follows more how fnmatch behaves and
not the somewhat strange rsync behaviour.

Not perfect but committing now so people can test and provide feedback.

Replace Id: tags with OpenBSD: tags
OK deraadt@

branches: 1.31.2;
Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

whitespace observed during a read-through

When reading the symlink value during the fts travers use ent->fts_accpath
since the fts traverse does chdirs for performance reasons.
OK deraadt@

remove sys/param.h that snuck in, by replacing MAXPATHLEN with PATH_MAX

Implement --exclude/exclude-file and --include/include-file.
Currently only simple include and excludes work, the advanced filters
introduced later in rsync are not implemented. It is unclear if the per
directory filters are something we want to implement. This requires
more modern protocols which openrsync is not able to handle right now.

This adds a special matching function to allow the ** matching which behaves
mostly like rsyncs version with the exception of how bad [] patterns are
expanded. For bad patterns openrsync follows more how fnmatch behaves and
not the somewhat strange rsync behaviour.

Not perfect but committing now so people can test and provide feedback.

Replace Id: tags with OpenBSD: tags
OK deraadt@

Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

When reading the symlink value during the fts travers use ent->fts_accpath
since the fts traverse does chdirs for performance reasons.
OK deraadt@

remove sys/param.h that snuck in, by replacing MAXPATHLEN with PATH_MAX

Implement --exclude/exclude-file and --include/include-file.
Currently only simple include and excludes work, the advanced filters
introduced later in rsync are not implemented. It is unclear if the per
directory filters are something we want to implement. This requires
more modern protocols which openrsync is not able to handle right now.

This adds a special matching function to allow the ** matching which behaves
mostly like rsyncs version with the exception of how bad [] patterns are
expanded. For bad patterns openrsync follows more how fnmatch behaves and
not the somewhat strange rsync behaviour.

Not perfect but committing now so people can test and provide feedback.

Replace Id: tags with OpenBSD: tags
OK deraadt@

Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

remove sys/param.h that snuck in, by replacing MAXPATHLEN with PATH_MAX

Implement --exclude/exclude-file and --include/include-file.
Currently only simple include and excludes work, the advanced filters
introduced later in rsync are not implemented. It is unclear if the per
directory filters are something we want to implement. This requires
more modern protocols which openrsync is not able to handle right now.

This adds a special matching function to allow the ** matching which behaves
mostly like rsyncs version with the exception of how bad [] patterns are
expanded. For bad patterns openrsync follows more how fnmatch behaves and
not the somewhat strange rsync behaviour.

Not perfect but committing now so people can test and provide feedback.

Replace Id: tags with OpenBSD: tags
OK deraadt@

Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

Implement --exclude/exclude-file and --include/include-file.
Currently only simple include and excludes work, the advanced filters
introduced later in rsync are not implemented. It is unclear if the per
directory filters are something we want to implement. This requires
more modern protocols which openrsync is not able to handle right now.

This adds a special matching function to allow the ** matching which behaves
mostly like rsyncs version with the exception of how bad [] patterns are
expanded. For bad patterns openrsync follows more how fnmatch behaves and
not the somewhat strange rsync behaviour.

Not perfect but committing now so people can test and provide feedback.

Replace Id: tags with OpenBSD: tags
OK deraadt@

Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

Replace Id: tags with OpenBSD: tags
OK deraadt@

Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

Remove unveil() from the rsync_sender() and flist_gen(). The sender is
not able to properly unveil itself because you can request many files
as arguments. At the same time the sender is read-only and uses rpath
pledge() so the gain from unveil() is less of an issue.
On the receiver side all files land in one directory and this part still
uses unveil() to protect rsync to somehow walk out of the destination
directory.
From kristaps@

Adjust function name in error strings.
From kristaps@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

Some asprintf() calls were checked < 0, rather than the precise == -1.
ok millert nicm tb, etc

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

fix free() on uninitialized pointer with -rx and same
suggestions and ok naddy@ and ok previois diff florian@.
from Hiltjo Posthuma hiltjo AT codemadness DOT org and
Bjoern Ketelaars bjorn DOT ketelaars AT hydroxide DOT nl,
Thanks.

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

spelling; from Hiltjo Posthuma

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

remove sess argument from log functions. ok deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno

cleanup weird spaces around !. (We normalize source-code to a standard
idiom because it is less error prone for a larger team. kristaps idiom
is highly divergent)
ok benno

whitespace and 80 chars per line

fix whitespace

Import Kristaps' openrsync into the tree.
OK deraadt@

Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.

Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!

OK deraadt@

Increasing strictness regarding signed-vs-unsigned types and their range
in the io-path, whic is done by seperating int vs uint functions variants.
reviewed by naddy, florian, and jsg

Treat time from remote as unsigned 32 bit rather than signed, when
casting it into a time_t. If the remote doesn't muck things up, we may
make it through 2038.. (best that can be done without protocol repair
and coordination)
ok benno

indents and reflows around ERR*() and LOG*(); ok benno

repair a few more yoda compares

kristaps 7721288a1d170f4d789bf7a7b822f14f91f7bcb9

In order for GPL rsync(1) to work with --delete when openrsync is a
remote sender, we need to set the FLIST_TOP_LEVEL bit for all
top-level directories. This is because the GPL rsync(1) uses this bit
to determine which directories to scan for files for deletion.

kristaps acb8f263717f27691f0318d4b7154f854b7206b3

As found by benno@, if --numeric-ids is passed in, rsync does not send
or receive the uid/gid lists at all. This also means that we need not
process the lists, as we're simply going to copy around the same
value.

We need to send/receive the rdev after gid and before symlink.
From kristaps, thanks!

I did some work here.

implement -D and in turn -a

"you snooze, you get collisions" deraadt@

unwrap lines which do not need wrapping

sync with kristaps, commit c5350b9055c3921001778275bb808a5c811c21c1

Protocol-level support for -o. The actual sharing itself is more or less a
copy of the existing -g code. I've refactored a lot of the ids.c code to be
generic and only accept a "isgid", as the rest is the same. So there's some
churn as I make all references to "group" be generic.

whitespace and knf

sync a chunk that was lost, from
commit 40bd0babafaa424d20af28128b76878d6cee7b87
Author: kristaps <>
Date: Mon Feb 11 23:27:36 2019 +0000

Normal form.

sync
commit e589e5f657ef334e6fcbfb76962fbd380d13fd2e
Author: kristaps <>
Date: Tue Feb 12 08:05:32 2019 +0000

Put unveil() functions on their own line. This makes it easier for my secret
portability shim I use for valgrind on linux.

sync
commit 72ea211d57a0f235a2d7439a7e908af66f47fa10
Author: kristaps <>
Date: Tue Feb 12 07:29:55 2019 +0000

Sanitise group handling to handle group wheel (according to rsync, this is not
ever remapped by name) and empty group names (not allowed, but we must accept them
anyway). Push most of this code into ids.c and make sure it is style(9)
conformant. Add TODO about performance and clarify protocol in rsync.5.

sync
commit bc997c5d70dbe402903c7ce0c915c7fe3744a754
Author: kristaps <>
Date: Mon Feb 11 23:37:41 2019 +0000

Move identifier code into ids.c.

sync
commit 6300c70a476276aba832e7e2ba19e7e6e11a7cc7
Author: kristaps <>
Date: Mon Feb 11 23:30:51 2019 +0000

Integrate gid send/receive and remapping. This remaps group identifiers as
follows: first, look up all sender group names on the local host. If we find
them, use the local identifier. Otherwise, use the remote identifier.

sync:
commit 472ad2fab2692579a5773d78d6934b03c1098fb2
Author: kristaps <>
Date: Mon Feb 11 20:45:22 2019 +0000

Enable groupid in the protocol. This is not linked to the system itself yet.

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with. Proofed by florian and benno