Preparing for release of 3.0.5

Avoid a hang when using at least 3 --verbose options on a transfer with
a client sender (which includes local copying).
2026-09-08 19:30:38 -04:00 · 2008-12-28 18:02:17 -08:00 · 2008-12-28 17:51:36 -08:00 · 2008-12-27 11:22:02 -08:00 · 2008-11-15 15:32:02 -08:00 · 2008-11-15 15:25:30 -08:00
756 changed files with 27537 additions and 113474 deletions
@@ -1,17 +0,0 @@
-* text=auto eol=lf
-
-# The rsync-web/ subdirectory holds the project website source content
-# (mirrors what gets pushed to https://rsync.samba.org).  Exclude it from
-# `git archive` output so the release source tarball produced by
-# packaging/release.py step_7_tarball does not bloat with HTML the
-# tarball doesn't need.
-/rsync-web/ export-ignore
-
-# old_versions/ holds static binaries of historical rsync releases, used by the
-# version-mixing test suite (.github/workflows/ubuntu-version-mix.yml) to run
-# the current code against a real old peer over the daemon / remote-shell.
-# Mark the binaries as binary so the `text=auto eol=lf` rule above can't try to
-# normalise line endings and corrupt them; export-ignore keeps them out of the
-# release source tarball.
-/old_versions/rsync_* binary
-/old_versions/rsync_* export-ignore
@@ -1,4 +0,0 @@
-# These are supported funding model platforms
-
-github: RsyncProject
-patreon: AndrewTridgell
@@ -1,46 +0,0 @@
-name: Lint GitHub Actions workflows
-
-# Static-check the workflow YAML with rhysd/actionlint.  Catches missing
-# secrets, bad expressions, expression-type errors, unsupported runner
-# images, and (via embedded shellcheck) common pitfalls in `run:` scripts.
-# Trigger only on changes under .github/workflows/ so the rest of the
-# matrix isn't billed when nothing here moves.
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - '.github/workflows/*.yml'
-      - '.github/actionlint.yaml'
-      - '.github/actionlint.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths:
-      - '.github/workflows/*.yml'
-      - '.github/actionlint.yaml'
-      - '.github/actionlint.yml'
-
-permissions:
-  contents: read
-
-jobs:
-  actionlint:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: actionlint
-    steps:
-      - uses: actions/checkout@v4
-      - name: install actionlint
-        # Pin a version so this job is reproducible; bump deliberately.
-        # The download script verifies a SHA256 of the release tarball.
-        run: |
-          bash <(curl --proto '=https' --tlsv1.2 -fsSL \
-              https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) \
-              1.7.12
-          echo "$PWD" >>"$GITHUB_PATH"
-      - name: actionlint --version
-        run: actionlint -version
-      - name: actionlint .github/workflows/*.yml
-        run: actionlint -color
@@ -1,86 +0,0 @@
-name: Test rsync on AlmaLinux 8
-
-# Older-LTS coverage on the Fedora/RHEL family to help with backporting
-# security fixes. AlmaLinux 8 is the RHEL 8 rebuild and is the oldest
-# active LTS in this family (RHEL 8 full support runs to 2029).
-# GitHub Actions has no native runner for this family, so the job runs
-# inside an almalinux:8 container hosted on ubuntu-latest.
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/almalinux-8-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/almalinux-8-build.yml'
-  schedule:
-    - cron: '42 8 * * *'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    container:
-      image: almalinux:8
-    name: Test rsync on AlmaLinux 8
-    steps:
-    - name: install git
-      # actions/checkout needs git in the container before the checkout step.
-      run: dnf -y install git
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      # PowerTools is needed for libzstd-devel etc; xxhash and lz4 dev
-      # headers live in EPEL on RHEL 8. The default python3 on RHEL 8
-      # is 3.6, which is too old for runtests.py (uses capture_output=
-      # / text= introduced in 3.7), so install python39 and point
-      # /usr/bin/python3 at it.
-      run: |
-        dnf -y install epel-release
-        dnf config-manager --set-enabled powertools
-        dnf -y install gcc gcc-c++ make autoconf automake m4 \
-            python39 python39-pip diffutils \
-            openssl openssl-devel \
-            attr libattr-devel acl libacl-devel \
-            zstd libzstd-devel \
-            lz4 lz4-devel \
-            xxhash xxhash-devel
-        alternatives --set python3 /usr/bin/python3.9
-        pip3 install commonmark
-    - name: configure
-      run: ./configure --with-rrsync
-    - name: make
-      run: make
-    - name: info
-      run: ./rsync --version
-    - name: check
-      # In the container we already run as root, so no sudo. The
-      # crtimes-not-supported skip matches the other Linux jobs;
-      # daemon-chroot-acl and proxy-response-line-too-long skip because
-      # the default (secure) transport opens no listening socket.
-      run: RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/linux.txt make check
-    - name: check (TCP daemon transport)
-      # Second run exercising the real loopback-TCP daemon path.
-      run: ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j 8
-    - name: ssl file list
-      run: ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: almalinux-8-bin
-        path: |
-          rsync
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,124 +0,0 @@
-name: Build static rsync for Android
-
-# Cross-compiles statically-linked rsync binaries with the Android NDK,
-# suitable for dropping onto a phone (adb push / Termux) with no shared
-# libraries. arm64-v8a covers all modern phones; armeabi-v7a covers older
-# 32-bit devices. The binaries are uploaded as workflow artifacts.
-#
-# These are cross-compiled, so the test suite can't run here; we sanity
-# check that each binary is the right architecture, is static, and that
-# it executes (`--version`) under qemu-user.
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/android-static-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/android-static-build.yml'
-  schedule:
-    - cron: '42 8 * * 1'
-  workflow_dispatch:
-
-env:
-  # Minimum supported API level. 24 (Android 7.0) runs on every modern
-  # phone while keeping broad reach; bump if you need newer Bionic APIs.
-  ANDROID_API: 24
-
-jobs:
-  build:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: ${{ matrix.abi }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - abi: arm64-v8a       # modern phones
-            triple: aarch64-linux-android
-            qemu: qemu-aarch64-static
-          - abi: armeabi-v7a     # older 32-bit phones
-            triple: armv7a-linux-androideabi
-            qemu: qemu-arm-static
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install build prerequisites
-        run: sudo apt-get update && sudo apt-get install -y autoconf automake gawk qemu-user-static
-
-      - name: Configure and build (${{ matrix.abi }})
-        shell: bash
-        run: |
-          set -euo pipefail
-          NDK="${ANDROID_NDK_LATEST_HOME:-$ANDROID_NDK_ROOT}"
-          TC="$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin"
-          export CC="$TC/${{ matrix.triple }}${ANDROID_API}-clang"
-          export AR="$TC/llvm-ar" RANLIB="$TC/llvm-ranlib" STRIP="$TC/llvm-strip"
-          export CFLAGS="-O2" LDFLAGS="-static"
-
-          # Bionic doesn't declare lchmod()/lutimes() until API 36, but the
-          # symbols link, so configure mis-detects them -- force them off so
-          # rsync uses its fallbacks. The other cache vars restore values
-          # that configure can't probe when cross-compiling (Android runs a
-          # normal Linux kernel, so these match the native Linux result).
-          export ac_cv_func_lchmod=no ac_cv_func_lutimes=no \
-                 rsync_cv_HAVE_SOCKETPAIR=yes \
-                 rsync_cv_MKNOD_CREATES_FIFOS=yes \
-                 rsync_cv_MKNOD_CREATES_SOCKETS=yes
-
-          # Self-contained build: drop optional external libraries so the
-          # static binary needs nothing at runtime. rsync keeps md5/md4
-          # checksums and its bundled zlib.
-          ./configure --host=${{ matrix.triple }} --build=x86_64-pc-linux-gnu \
-            --enable-ipv6 \
-            --disable-zstd --disable-lz4 --disable-xxhash --disable-openssl \
-            --disable-iconv --disable-iconv-open \
-            --disable-acl-support --disable-xattr-support \
-            --disable-md2man --disable-roll-simd \
-            --with-included-popt --with-included-zlib
-
-          # Generate the awk-built headers serially first so the parallel
-          # build can't race on proto.h <- daemon-parm.h.
-          make proto.h
-          make -j"$(nproc)" rsync
-          "$STRIP" rsync
-
-      - name: Verify binary
-        shell: bash
-        run: |
-          set -euo pipefail
-          file rsync
-          # Gate: must be a statically-linked executable (no interpreter).
-          file rsync | grep -q "statically linked"
-          if file rsync | grep -q "dynamically linked"; then
-            echo "ERROR: binary is not static" >&2; exit 1
-          fi
-          # Best-effort: confirm it actually runs under qemu-user.
-          ${{ matrix.qemu }} ./rsync --version | head -3 || \
-            echo "WARNING: qemu smoke test did not run cleanly (check on a real device)"
-
-      - name: Package
-        shell: bash
-        run: |
-          set -euo pipefail
-          VER=$(sed -n 's/.*RSYNC_VERSION "\([^"]*\)".*/\1/p' version.h)
-          out="rsync-${VER}-android-${{ matrix.abi }}"
-          mkdir -p dist
-          cp rsync "dist/$out"
-          ( cd dist && sha256sum "$out" > "$out.sha256" )
-          echo "ARTIFACT_NAME=rsync-android-${{ matrix.abi }}" >>"$GITHUB_ENV"
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 45
-          name: ${{ env.ARTIFACT_NAME }}
-          path: dist/
@@ -1,75 +0,0 @@
-name: rsync ASan+UBSan (clang)
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/asan-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/asan-build.yml'
-  schedule:
-    # Weekly (Mon 09:42 UTC): catch breakage from a moving ubuntu-latest/clang
-    # toolchain (a new clang can add a UBSan check, or change ASan behaviour)
-    # that no code push would otherwise trigger.  Push/PR already gate every
-    # code change, so daily would just re-run an unchanged tree.
-    - cron: '42 9 * * 1'
-  workflow_dispatch:
-
-jobs:
-  asan:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: rsync ASan+UBSan (clang)
-    env:
-      # rsync intentionally leaks small allocations at process exit, so leak
-      # detection would be all noise; chase only memory-safety errors.
-      ASAN_OPTIONS: detect_leaks=0:abort_on_error=1
-      # UBSan is a gate: -fno-sanitize-recover=undefined (below) aborts on the
-      # first finding and halt_on_error=1 makes that fatal, so any undefined
-      # behaviour fails the run.  This needs the tree to be UBSan-clean: the
-      # remaining findings are fixed in code (hashtable/mdfour shifts, xattrs,
-      # and log.c's file_struct, kept aligned via rounding.h); only byteorder.h's
-      # intentional unaligned accessors are suppressed, with no_sanitize.
-      UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y clang acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      # -DNDEBUG builds as a shipped release does (assert() compiled out), so
-      # AddressSanitizer catches the over-reads/over-writes that an "assert()
-      # instead of a real bounds check" bug would cause in a production build.
-      # UBSan rides along on the same build; -fno-sanitize-recover=undefined
-      # makes any undefined behaviour abort (and thus fail the run) instead of
-      # merely printing it.
-      run: |
-        CC=clang \
-        CFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer -g -O1 -DNDEBUG" \
-        LDFLAGS="-fsanitize=address,undefined" \
-        ./configure --with-rrsync --disable-md2man --enable-strict-confinement
-    - name: make
-      # check-progs builds rsync plus the test helper programs (tls, trimslash,
-      # t_unsafe, ...) that runtests.py requires; plain "make" builds only rsync
-      # and runtests aborts on the missing helpers.
-      run: make check-progs
-    - name: info
-      run: ./rsync --version
-    - name: check (stdio-pipe transport)
-      # ASan+UBSan-instrumented coverage of the transfer, daemon, sender,
-      # receiver and metadata paths over the default stdio-pipe transport.
-      run: ./runtests.py --rsync-bin="$PWD/rsync" -j8
-    - name: check (TCP daemon transport)
-      # --use-tcp also exercises the loopback rsyncd listener and the client's
-      # TCP connection path.
-      run: ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j8
@@ -1,75 +0,0 @@
-name: Coverage (Ubuntu)
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/coverage.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/coverage.yml'
-  schedule:
-    - cron: '42 9 * * 1'
-  workflow_dispatch:
-
-jobs:
-  coverage:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: gcov coverage
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl gcovr
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      run: ./configure --enable-coverage --with-rrsync
-    - name: make
-      run: make
-    - name: info
-      run: rsync --version
-    # Two coverage runs: the default pipe transport, then a second pass over a
-    # real loopback rsyncd (--use-tcp) which also exercises the require_tcp-only
-    # tests. gcovr's --print-summary line/branch/decision totals go to the step
-    # log (and the job summary below), so the numbers are visible in CI.
-    # `make coverage` exits with the suite's status, so a regression fails CI.
-    - name: coverage (pipe transport)
-      run: |
-        set -o pipefail
-        sudo make coverage 2>&1 | tee cov-pipe.log
-    - name: coverage (TCP transport)
-      run: |
-        set -o pipefail
-        sudo make coverage-tcp 2>&1 | tee cov-tcp.log
-    - name: coverage summary
-      if: always()
-      run: |
-        {
-          echo "## gcov coverage"
-          echo "### Pipe transport (\`make coverage\`)"
-          echo '```'
-          grep -E '^(lines|functions|branches|decisions):' cov-pipe.log || echo '(no summary -- see step log)'
-          echo '```'
-          echo "### TCP transport (\`make coverage-tcp\`)"
-          echo '```'
-          grep -E '^(lines|functions|branches|decisions):' cov-tcp.log || echo '(no summary -- see step log)'
-          echo '```'
-        } >> "$GITHUB_STEP_SUMMARY"
-    - name: upload HTML reports
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: coverage-html
-        path: |
-          coverage
-          coverage-tcp
@@ -1,69 +0,0 @@
-name: Test rsync on Cygwin
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/cygwin-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/cygwin-build.yml'
-  schedule:
-    - cron: '42 8 * * *'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: windows-2022
-    name: Test rsync on Cygwin
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: cygwin
-      run: choco install -y --no-progress cygwin cyg-get
-    - name: prep
-      run: |
-        cyg-get make autoconf automake gcc-core attr libattr-devel python39 python39-pip libzstd-devel liblz4-devel libssl-devel libxxhash0 libxxhash-devel
-        echo "C:/tools/cygwin/bin" >>$Env:GITHUB_PATH
-    - name: commonmark
-      run: bash -c 'python3 -mpip install --user commonmark'
-    - name: configure
-      run: bash -c './configure --with-rrsync'
-    - name: make
-      run: bash -c 'make'
-    - name: install
-      run: bash -c 'make install'
-    - name: info
-      run: bash -c '/usr/local/bin/rsync --version'
-    - name: check
-      # chown-fake / devices-fake / xattrs / xattrs-hlink now RUN on Cygwin
-      # (rsyncfns.py drives xattrs via getfattr/setfattr from the `attr`
-      # package installed above), verified on a real Cygwin host. The real
-      # chown/devices tests still skip (need root/mknod), as do the
-      # RESOLVE_BENEATH symlink-race tests.
-      run: bash -c 'RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/cygwin.txt make check'
-    - name: check (TCP daemon transport)
-      # Second run with daemon tests over a real loopback rsyncd; the default
-      # 'make check' above uses the secure stdio-pipe transport.
-      run: bash -c './runtests.py --rsync-bin=`pwd`/rsync.exe --use-tcp -j 8'
-    - name: ssl file list
-      run: bash -c 'PATH="/usr/local/bin:$PATH" rsync-ssl --no-motd download.samba.org::rsyncftp/ || true'
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: cygwin-bin
-        path: |
-          rsync.exe
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,73 +0,0 @@
-name: Test fleettest harness
-
-# Bitrot check for testsuite/fleettest.py (the developer fleet CI harness).
-# fleettest is meant to be run by developers on a modern Ubuntu box, so this
-# job runs only on ubuntu-latest: it stands up a one-host "fleet" of two
-# targets that both ssh to localhost and runs a real fleettest pass against it.
-# It does not run on the BSD/Solaris/macOS/Cygwin matrix.
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'testsuite/fleettest.py'
-      - '.github/workflows/fleettest.yml'
-      - 'runtests.py'
-      - 'testsuite/skiplist/**'
-      - 'testsuite/skiplist-spec_test.py'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths:
-      - 'testsuite/fleettest.py'
-      - '.github/workflows/fleettest.yml'
-      - 'runtests.py'
-      - 'testsuite/skiplist/**'
-      - 'testsuite/skiplist-spec_test.py'
-  workflow_dispatch:
-  schedule:
-    - cron: '17 7 * * 1'
-
-jobs:
-  fleettest:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: fleettest against localhost
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gcc g++ gawk autoconf automake \
-          acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev \
-          python3-cmarkgfm openssl rsync openssh-server
-    - name: set up ssh to localhost
-      run: |
-        mkdir -p ~/.ssh && chmod 700 ~/.ssh
-        ssh-keygen -t ed25519 -N '' -f ~/.ssh/id_ed25519
-        cat ~/.ssh/id_ed25519.pub >> ~/.ssh/authorized_keys
-        chmod 600 ~/.ssh/authorized_keys
-        sudo systemctl start ssh || sudo service ssh start
-        # fleettest connects with `ssh -o BatchMode=yes localhost`, which won't
-        # answer a host-key prompt -- so pre-trust localhost in known_hosts.
-        ssh-keyscan -H localhost 127.0.0.1 >> ~/.ssh/known_hosts 2>/dev/null
-        ssh -o BatchMode=yes -o ConnectTimeout=15 localhost 'echo ssh-to-localhost-ok'
-    - name: write localhost fleet config
-      run: |
-        cat > fleettest-ci.json <<'EOF'
-        { "targets": [
-          { "name": "local-a", "ssh_host": "localhost", "workflow": "none.yml",
-            "configure_flags": [], "builddir": "rsync-citest-a", "privilege": "sudo" },
-          { "name": "local-b", "ssh_host": "localhost", "workflow": "none.yml",
-            "configure_flags": [], "builddir": "rsync-citest-b", "privilege": "sudo" }
-        ] }
-        EOF
-    - name: fleettest --list (config sanity)
-      run: python3 testsuite/fleettest.py --fleet fleettest-ci.json --list
-    - name: run fleettest against localhost
-      # Two targets both on localhost exercise the parallel multi-target path
-      # and the per-run dir / port isolation; exit 0 iff every cell is OK.
-      run: python3 testsuite/fleettest.py --fleet fleettest-ci.json --timing
@@ -1,55 +0,0 @@
-name: Test rsync on FreeBSD
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/freebsd-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/freebsd-build.yml'
-  schedule:
-    - cron: '42 8 * * 1'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: Test rsync on FreeBSD
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Test in FreeBSD VM
-      id: test
-      uses: vmactions/freebsd-vm@v1
-      with:
-        usesh: true
-        prepare: |
-          pkg install -y bash autotools m4 devel/xxhash zstd liblz4 python3 archivers/liblz4 git
-        run: |
-          freebsd-version
-          ./configure --with-rrsync -disable-zstd --disable-md2man --disable-xxhash --disable-lz4
-          make
-          ./rsync --version
-          make check
-          ./runtests.py --rsync-bin=`pwd`/rsync --use-tcp -j 8
-          ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: freebsd-bin
-        path: |
-          rsync
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,69 +0,0 @@
-name: Test rsync on macOS
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/macos-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/macos-build.yml'
-  schedule:
-    - cron: '42 8 * * *'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: macos-latest
-    name: Test rsync on macOS
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        brew install automake openssl xxhash zstd lz4
-        pip3 install --user --break-system-packages commonmark
-        echo "$(brew --prefix)/bin" >>"$GITHUB_PATH"
-    - name: configure
-      run: |
-        BREW_PREFIX=$(brew --prefix)
-        OPENSSL_PREFIX=$(brew --prefix openssl)
-        CPPFLAGS="-I${BREW_PREFIX}/include -I${OPENSSL_PREFIX}/include" \
-        LDFLAGS="-L${BREW_PREFIX}/lib -L${OPENSSL_PREFIX}/lib" \
-        ./configure --with-rrsync
-    - name: make
-      run: make
-    - name: install
-      run: sudo make install
-    - name: info
-      run: rsync --version
-    - name: check
-      # chown-fake / devices-fake / xattrs / xattrs-hlink now RUN on macOS
-      # (rsyncfns.py drives xattrs via the `xattr` command), verified on a
-      # real macOS host, so they're no longer in the skip set.
-      run: sudo RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/macos.txt make check
-    - name: check (TCP daemon transport)
-      # Second run with daemon tests over a real loopback rsyncd; the default
-      # 'make check' above uses the secure stdio-pipe transport.
-      run: sudo ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j 8
-    - name: ssl file list
-      run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: macos-bin
-        path: |
-          rsync
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,56 +0,0 @@
-name: Test rsync on NetBSD
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/netbsd-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/netbsd-build.yml'
-  schedule:
-    - cron: '42 8 * * 1'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: Test rsync on NetBSD
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Test in NetBSD VM
-      id: test
-      uses: vmactions/netbsd-vm@v1
-      with:
-        usesh: true
-        prepare: |
-          PATH=/usr/sbin:$PATH pkg_add autoconf automake python312
-          ln -sf /usr/pkg/bin/python3.12 /usr/pkg/bin/python3
-        run: |
-          uname -a
-          ./configure --with-rrsync --disable-zstd --disable-md2man --disable-xxhash --disable-lz4
-          make
-          ./rsync --version
-          make check
-          ./runtests.py --rsync-bin=`pwd`/rsync --use-tcp -j 8
-          ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: netbsd-bin
-        path: |
-          rsync
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,72 +0,0 @@
-name: Test rsync on OpenBSD
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/openbsd-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/openbsd-build.yml'
-  schedule:
-    - cron: '42 8 * * 1'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: Test rsync on OpenBSD
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Test in OpenBSD VM
-      id: test
-      uses: vmactions/openbsd-vm@v1
-      with:
-        usesh: true
-        prepare: |
-          pkg_add -I bash autoconf%2.71 automake%1.16
-        run: |
-          uname -a
-          export AUTOCONF_VERSION=2.71
-          export AUTOMAKE_VERSION=1.16
-          ./configure --with-rrsync --disable-zstd --disable-md2man --disable-xxhash --disable-lz4
-          make
-          ./rsync --version
-          # The flipper (symlink-race) tests are excluded on OpenBSD, as on the
-          # fleet's OpenBSD box: this kernel has a connect()-under-rename-load
-          # lost-wakeup and an FFS rename-storm corruption that hang them to
-          # the 300s timeout for non-rsync reasons (see
-          # dev-notes/openbsd-connect-lost-wakeup-report.txt); the protections
-          # they exercise are verified on the Linux/BSD boxes.
-          export RSYNC_EXCLUDE=acl-symlink-race,sender-readlink-atfd,sender-remove-source-secure
-          make check
-          # The --use-tcp daemon tests run at -j2 here (vs -j8 elsewhere): this
-          # job runs inside a nested VM, and at -j8 the many concurrent loopback
-          # daemons occasionally lose a connection-handshake timing race under
-          # that resource pressure, hanging one test to the 300s timeout. It is
-          # an environment artifact, not an rsync bug (the handshake is
-          # deadlock-free and unreproducible elsewhere, even pinned to 1 CPU at
-          # -j8); -j2 keeps the VM from over-subscribing. The pipe `make check`
-          # above stays at the default parallelism.
-          ./runtests.py --rsync-bin=`pwd`/rsync --use-tcp -j 2
-          ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: openbsd-bin
-        path: |
-          rsync
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,94 +0,0 @@
-name: rsync scan-build (clang analyzer)
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/scan-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/scan-build.yml'
-  workflow_dispatch:
-
-jobs:
-  # GATING run: pinned clang-18 on a pinned runner so the checker set -- and
-  # thus the expected zero -- is deterministic.  The tree is kept clean for
-  # clang-18, so --status-bugs (non-zero exit on any report) fails the build
-  # when a new finding appears.  Pin both the analyzer (clang-18/clang-tools-18)
-  # and the runner (ubuntu-24.04, whose apt repos carry those packages).
-  gate-clang18:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-24.04
-    name: scan-build gate (clang-18, pinned)
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y clang-18 clang-tools-18 acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev libpopt-dev openssl
-    - name: configure (under scan-build)
-      # Run configure under scan-build so its analyzer compiler-wrapper is baked
-      # into the Makefile's $(CC); --disable-md2man avoids the doc toolchain.
-      run: scan-build-18 ./configure --with-rrsync --disable-md2man
-    - name: scan-build (gating)
-      # --status-bugs makes scan-build exit non-zero if it finds ANY report.
-      # pipefail + 'exit $status' propagate that through the tee so the job goes
-      # red while still printing the summary; the report uploads for triage.
-      run: |
-        set -o pipefail
-        status=0
-        scan-build-18 --status-bugs -o "$PWD/scan-report" make check-progs -j"$(nproc)" 2>&1 | tee scan-build.out || status=$?
-        echo '## scan-build gate (clang-18)' >>"$GITHUB_STEP_SUMMARY"
-        grep -E 'scan-build: .* bugs? found|scan-build: No bugs found' scan-build.out >>"$GITHUB_STEP_SUMMARY" || true
-        exit $status
-    - name: upload report
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: scan-build-report-clang18
-        path: scan-report
-        if-no-files-found: ignore
-
-  # INFORMATIONAL run: whatever clang ubuntu-latest currently ships.  Newer
-  # clang releases enable extra, FP-heavy checkers (e.g. unix.Chroot
-  # "no chdir after chroot", alpha.unix.Stream) that the gate deliberately
-  # avoids, so this is NOT a gate (no --status-bugs).  It surfaces what the
-  # newest analyzer sees -- useful for spotting genuine new findings before a
-  # gate bump -- without blocking merges.  continue-on-error keeps a noisy or
-  # broken run from affecting the workflow's required status.
-  informational-latest:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: scan-build (latest clang, informational)
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y clang clang-tools acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev libpopt-dev openssl
-    - name: configure (under scan-build)
-      run: scan-build ./configure --with-rrsync --disable-md2man
-    - name: scan-build (informational)
-      run: |
-        scan-build -o "$PWD/scan-report" make check-progs -j"$(nproc)" 2>&1 | tee scan-build.out
-        echo '## scan-build informational (latest clang)' >>"$GITHUB_STEP_SUMMARY"
-        grep -E 'scan-build: .* bugs? found|scan-build: No bugs found' scan-build.out >>"$GITHUB_STEP_SUMMARY" || true
-    - name: upload report
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: scan-build-report-latest
-        path: scan-report
-        if-no-files-found: ignore
@@ -1,55 +0,0 @@
-name: Test rsync on Solaris
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/solaris-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/solaris-build.yml'
-  schedule:
-    - cron: '42 8 * * 1'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: Test rsync on Solaris
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Test in Solaris VM
-      id: test
-      uses: vmactions/solaris-vm@v1
-      with:
-        usesh: true
-        prepare: |
-          pkg install bash automake gnu-m4 pkg://solaris/runtime/python-35 autoconf gcc git
-        run: |
-          uname -a
-          ./configure --with-rrsync -disable-zstd --disable-md2man --disable-xxhash --disable-lz4
-          make
-          ./rsync --version
-          make check
-          ./runtests.py --rsync-bin=`pwd`/rsync --use-tcp -j 8
-          ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: solaris-bin
-        path: |
-          rsync
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,68 +0,0 @@
-name: Test rsync on Ubuntu 22.04
-
-# Older-LTS coverage to help with backporting security fixes. ubuntu-22.04
-# is currently the oldest GitHub Actions runner image (20.04 was retired
-# in April 2025).
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/ubuntu-22.04-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/ubuntu-22.04-build.yml'
-  schedule:
-    - cron: '42 8 * * *'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-22.04
-    name: Test rsync on Ubuntu 22.04
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      run: ./configure --with-rrsync
-    - name: make
-      run: make
-    - name: install
-      run: sudo make install
-    - name: info
-      run: rsync --version
-    - name: check
-      run: sudo RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/linux.txt make check
-    - name: check30
-      run: sudo RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/linux.txt make check30
-    - name: check29
-      run: sudo RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/linux.txt,@testsuite/skiplist/proto29.txt make check29
-    - name: check (TCP daemon transport)
-      # Second run with daemon tests over a real loopback rsyncd; the default
-      # 'make check' above uses the secure stdio-pipe transport.
-      run: sudo ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j 8
-    - name: ssl file list
-      run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: ubuntu-22.04-bin
-        path: |
-          rsync
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,82 +0,0 @@
-name: Test rsync on Ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/ubuntu-build.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/ubuntu-build.yml'
-  schedule:
-    - cron: '42 8 * * *'
-
-jobs:
-  test:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: Test rsync on Ubuntu
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      run: ./configure --with-rrsync
-    - name: make
-      run: make
-    - name: install
-      run: sudo make install
-    - name: info
-      run: rsync --version
-    - name: check
-      run: sudo RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/linux.txt make check
-    - name: check30
-      run: sudo RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/linux.txt make check30
-    - name: check29
-      run: sudo RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/linux.txt,@testsuite/skiplist/proto29.txt make check29
-    - name: check (TCP daemon transport)
-      # Second run with daemon tests over a real loopback rsyncd. The default
-      # 'make check' above uses the secure stdio-pipe transport (no listening
-      # sockets); this run exercises the real TCP accept/auth path. Skip-set
-      # is env-dependent here (chroot-acl), so leave RSYNC_EXPECT_SKIPPED unset.
-      run: sudo ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j 8
-    - name: check (non-root, targeted)
-      # Every run above is root (sudo), so privilege-sensitive tests never hit
-      # their non-root path. Run those here as the unprivileged 'runner' user
-      # (NO sudo). Explicit test names make runtests.py full_run False, so
-      # RSYNC_EXPECT_SKIPPED is bypassed -- no per-platform skip list needed.
-      #   daemon-namecvt-empty-response -- REQUIRES non-root (skips as root by
-      #     design); the only test with no other CI coverage (Benjamin #2).
-      #   ownership-depth -- non-root takes the group-only remap path.
-      #   daemon          -- non-root takes the default-config path.
-      # CONVENTION: a new test that requires/meaningfully exercises a non-root
-      # path must be added to the list below (kept in sync with the fleet
-      # harness's nonroot_tests).
-      run: |
-        sudo rm -rf testtmp   # prior root steps left it root-owned
-        ./runtests.py --rsync-bin="$PWD/rsync" \
-          daemon-namecvt-empty-response ownership-depth daemon
-    - name: ssl file list
-      run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
-    - name: save artifact
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: ubuntu-bin
-        path: |
-          rsync
-          rsync-ssl
-          rsync.1
-          rsync-ssl.1
-          rsyncd.conf.5
-          rrsync.1
-          rrsync
@@ -1,80 +0,0 @@
-name: Test rsync version mixing on Ubuntu
-
-# Runs the CURRENT test suite with two different rsync binaries: the freshly
-# built ./rsync as the client/driver, and a committed OLD static binary
-# (old_versions/rsync_<ver>) as the daemon / remote-shell peer. This exercises
-# real version mixing over the wire -- more convincing than --protocol forcing,
-# which only makes the current binary speak an old protocol.
-#
-# Direction is fixed: the current binary always drives (only it understands the
-# new test scripts); the old binary is only ever the server/daemon side. The
-# reverse (old client driving new scripts) is not possible -- but one test,
-# reverse-daemon-delta, swaps the roles internally (current build as the daemon,
-# old binary as the client) to cover the backward-compat direction: a current
-# daemon serving the installed base of old clients.
-#
-# The per-version manifest testsuite/expect/rsync_<ver>.expect lists exactly
-# which tests run and each one's expected outcome (pass/skip/fail/xfail), so an
-# old peer's known feature gaps are recorded rather than treated as breakage.
-#
-# All peers run in a SINGLE job (looped, not a matrix) so the PR shows one check
-# line rather than one per version. Each peer/transport is a foldable ::group::
-# in the log, and a failure annotates which peer/transport broke.
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/ubuntu-version-mix.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/ubuntu-version-mix.yml'
-  schedule:
-    - cron: '52 8 * * 1'
-
-jobs:
-  version-mix:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    name: rsync version-mix
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      run: ./configure --with-rrsync
-    - name: make
-      # check-progs builds rsync AND the test helper programs (tls, trimslash,
-      # t_unsafe, ...) that runtests.py requires; plain `make` does not.
-      run: make check-progs
-    - name: info
-      run: ./rsync --version | head -1
-    - name: version mixing (all peers, pipe + TCP transports)
-      run: |
-        rc=0
-        for peer in old_versions/rsync_*; do
-          chmod +x "$peer"
-          name=$(basename "$peer")
-          expect="testsuite/expect/$name.expect"
-          for transport in pipe tcp; do
-            tcp=()
-            [ "$transport" = tcp ] && tcp=(--use-tcp)
-            echo "::group::$name ($transport): $("$peer" --version | head -1)"
-            if ! ./runtests.py --rsync-bin="$PWD/rsync" --rsync-bin2="$PWD/$peer" \
-                  --expect-result "$expect" "${tcp[@]}" -j 8; then
-              echo "::error::version-mix failed: $name ($transport)"
-              rc=1
-            fi
-            echo "::endgroup::"
-          done
-        done
-        exit $rc
@@ -1,99 +0,0 @@
-name: Valgrind memcheck
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/valgrind.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/valgrind.yml'
-  schedule:
-    - cron: '17 4 * * *'
-  workflow_dispatch:
-
-jobs:
-  memcheck:
-    # temporary gate: PR CI runs only for PRs labeled 'run-ci', to save CI
-    # minutes; labels need triage access, so fork PRs can't self-enable.
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-ci')
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    strategy:
-      fail-fast: false
-      matrix:
-        privilege: [ user, root ]
-        transport: [ pipe, tcp ]
-    name: memcheck (${{ matrix.privilege }}, ${{ matrix.transport }})
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y valgrind acl libacl1-dev attr libattr1-dev \
-          liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      run: ./configure --with-rrsync --enable-debug
-    - name: make
-      run: make check-progs   # builds rsync + the test helper programs runtests.py needs
-    - name: info
-      run: ./rsync --version
-
-    # Run the whole suite under valgrind.  We gate on memory *errors* (uninit
-    # reads, invalid read/write, bad frees, uninit syscall params), not leaks:
-    # rsync deliberately leaves file-list/socket/option memory unfreed at exit
-    # (short-lived process; the OS reclaims), so --leak-check=no avoids a sea of
-    # by-design "definitely lost" reports.  Functional pass/fail is covered by
-    # the other workflows, so the suite is allowed to finish regardless of
-    # per-test results; the scan step below is the gate.  --error-exitcode=0
-    # keeps valgrind from perturbing test exit codes; the bundled
-    # testsuite/valgrind.supp silences known-benign reports.
-    - name: run testsuite under valgrind
-      run: |
-        SUDO=
-        [ "${{ matrix.privilege }}" = root ] && SUDO="sudo -E"
-        TCP=
-        [ "${{ matrix.transport }}" = tcp ] && TCP="--use-tcp"
-        $SUDO ./runtests.py --valgrind \
-          --valgrind-opts="--leak-check=no --error-exitcode=0" \
-          $TCP -j8 --preserve-scratch || true
-
-    - name: scan for unsuppressed valgrind errors
-      run: |
-        sudo chown -R "$USER" testtmp 2>/dev/null || true
-        mapfile -t logs < <(find testtmp -name 'valgrind.*.log' 2>/dev/null)
-        if [ "${#logs[@]}" -eq 0 ]; then
-          echo "::error::no valgrind logs were produced -- the suite did not run"
-          exit 1
-        fi
-        echo "scanned ${#logs[@]} valgrind log(s)"
-        bad=()
-        for f in "${logs[@]}"; do
-          grep -qE 'ERROR SUMMARY: [1-9][0-9]* errors' "$f" && bad+=("$f")
-        done
-        if [ "${#bad[@]}" -ne 0 ]; then
-          echo "::error::valgrind reported unsuppressed errors in ${#bad[@]} run(s)"
-          for f in "${bad[@]}"; do
-            echo "===== $f ====="
-            sed 's/==[0-9]*== //' "$f" | grep -A18 \
-              -E 'depends on uninitialised|points to uninitialised|Invalid (read|write|free)|lost in loss record|Mismatched free' \
-              | head -60
-          done
-          exit 1
-        fi
-        echo "valgrind clean: no unsuppressed errors"
-
-    - name: upload valgrind logs on failure
-      if: failure()
-      uses: actions/upload-artifact@v4
-      with:
-        name: valgrind-logs-${{ matrix.privilege }}-${{ matrix.transport }}
-        path: testtmp/**/valgrind.*.log
-        if-no-files-found: ignore
-        retention-days: 7
@@ -12,63 +12,30 @@ config.h.in
 config.h.in.old
 config.log
 config.status
-aclocal.m4
 /proto.h
 /proto.h-tstamp
-/rsync*.[15]
-/rrsync
-/rrsync*.1
-/rsync*.html
-/rrsync*.html
-/help-rsync*.h
-/default-cvsignore.h
-/default-dont-compress.h
-/daemon-parm.h
-/.md2man-works
+/rsync.1
+/rsyncd.conf.5
 /autom4te*.cache
 /confdefs.h
 /conftest*
 /dox
 /getgroups
-/gists
 /gmon.out
 /rsync
-/stunnel-rsyncd.conf
 /shconfig
-/git-version.h
 /testdir
 /tests-dont-exist
 /testtmp
 /tls
-/testrun
 /trimslash
 /t_unsafe
-/t_acl
-/t_chmod_secure
-/t_rename_secure
-/t_secure_relpath
-/t_symlink_secure
-/t_hashtable_overflow
-/t_iwildmatch
-/t_clean_fname
-/t_safe_arg
-/simdtest
 /wildtest
 /getfsdev
-/t_safe_arg_main
 /rounding.h
 /doc/rsync.pdf
 /doc/rsync.ps
 /support/savetransfer
 /testsuite/chown-fake.test
 /testsuite/devices-fake.test
-/testsuite/xattrs-hlink.test
-/testsuite/fleettest.json
-/fleettest-logs
 /patches
-/patches.gen
-/build
-/auto-build-save
-.deps
-/*.exe
-*.dSYM/
@@ -1,16 +1,7 @@
-REGARDING OPENSSL AND XXHASH
-
-In addition, as a special exception, the copyright holders give
-permission to dynamically link rsync with the OpenSSL and xxhash
-libraries when those libraries are being distributed in compliance
-with their license terms, and to distribute a dynamically linked
-combination of rsync and these libraries.  This is also considered
-to be covered under the GPL's System Libraries exception.
-
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -654,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    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, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@@ -673,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
@@ -0,0 +1,63 @@
+To build and install rsync:
+
+  $ ./configure
+  $ make
+  # make install
+
+You may set the installation directory and other parameters by options
+to ./configure.  To see them, use:
+
+  $ ./configure --help
+
+Configure tries to figure out if the local system uses group "nobody" or
+"nogroup" by looking in the /etc/group file.  (This is only used for the
+default group of an rsync daemon, which attempts to run with "nobody"
+user and group permissions.)  You can change the default user and group
+for the daemon by editing the NOBODY_USER and NOBODY_GROUP defines in
+config.h, or just override them in your /etc/rsyncd.conf file.
+
+As of 2.4.7, rsync uses Eric Troan's popt option-parsing library.  A
+cut-down copy of release 1.6.4 is included in the rsync distribution,
+and will be used if there is no popt library on your build host, or if
+the --with-included-popt option is passed to ./configure.
+
+If you configure using --enable-maintainer-mode, then rsync will try
+to pop up an xterm on DISPLAY=:0 if it crashes.  You might find this
+useful, but it should be turned off for production builds.
+
+RPM NOTES
+---------
+
+Under packaging you will find .spec files for several distributions.
+The .spec file in packaging/lsb can be used for Linux systems that
+adhere to the Linux Standards Base (e.g., RedHat and others).
+
+HP-UX NOTES
+-----------
+
+The HP-UX 10.10 "bundled" C compiler seems not to be able to cope with
+ANSI C.  You may see this error message in config.log if ./configure
+fails:
+
+  (Bundled) cc: "configure", line 2162: error 1705: Function prototypes are an ANSI feature.
+
+Install gcc or HP's "ANSI/C Compiler".
+
+MAC OSX NOTES
+-------------
+
+Some versions of Mac OS X (Darwin) seem to have an IPv6 stack, but do
+not completely implement the "New Sockets" API.  
+
+<http://www.ipv6.org/impl/mac.html> says that Apple started to support
+IPv6 in 10.2 (Jaguar).  If your build fails, try again after running
+configure with --disable-ipv6.
+
+IBM AIX NOTES
+-------------
+
+IBM AIX has a largefile problem with mkstemp.  See IBM PR-51921.
+The workaround is to append the below to config.h
+	#ifdef _LARGE_FILES
+	#undef HAVE_SECURE_MKSTEMP
+	#endif
@@ -1,275 +0,0 @@
-# How to build and install rsync
-
-When building rsync, you'll want to install various libraries in order to get
-all the features enabled.  The configure script will alert you when the
-newest libraries are missing and tell you the appropriate `--disable-LIB`
-option to use if you want to just skip that feature.  What follows are various
-support libraries that you may want to install to build rsync with the maximum
-features (the impatient can skip down to the package summary):
-
-## Ubuntu users: skip the build, use the PPA
-
-If you are on a currently supported Ubuntu series (jammy 22.04 LTS, noble
-24.04 LTS, questing 25.10, resolute 26.04 LTS) and just want the latest
-upstream rsync, the rsync project maintains a Launchpad PPA that tracks
-stable releases:
-
->     sudo add-apt-repository ppa:rsyncproject/rsync
->     sudo apt update && sudo apt install rsync
-
-See [the PPA page][ppa] for current build status across architectures.
-
-[ppa]: https://launchpad.net/~rsyncproject/+archive/ubuntu/rsync
-
-To test the upcoming release instead, there is also a [`rsync-latest`
-PPA][ppa-latest] that is rebuilt from the tip of the git master branch.  These
-are development snapshots whose version numbers (such as
-`3.5.0~git20260601...`) deliberately sort below the matching stable release, so
-the stable PPA above will never silently move you from a release onto a
-snapshot.  Use it for testing only -- it may contain unreleased changes:
-
->     sudo add-apt-repository ppa:rsyncproject/rsync-latest
->     sudo apt update && sudo apt install rsync
-
-[ppa-latest]: https://launchpad.net/~rsyncproject/+archive/ubuntu/rsync-latest
-
-The rest of this document covers building from source.
-
-## The basic setup
-
-You need to have a C compiler installed and optionally a C++ compiler in order
-to try to build some hardware-accelerated checksum routines.  Rsync also needs
-a modern awk, which might be provided via gawk or nawk on some OSes.
-
-## Autoconf & manpages
-
-If you're installing from the git repo (instead of a release tar file) you'll
-also need the GNU autotools (autoconf & automake) and your choice of 2 python3
-markdown libraries: cmarkgfm or commonmark (needed to generate the manpages).
-If your OS doesn't provide a python3-cmarkgfm or python3-commonmark package,
-you can run the following to install the commonmark python library for your
-build user (after installing python3's pip package):
-
->     python3 -mpip install --user commonmark
-
-You can test if you've got it fixed by running (from the rsync checkout):
-
->     ./md-convert --test rsync-ssl.1.md
-
-Alternately, you can avoid generating the manpages by fetching the very latest
-versions (that match the latest git source) from the [generated-files][6] dir.
-One way to do that is to run:
-
->     ./prepare-source fetchgen
-
-[6]: https://download.samba.org/pub/rsync/generated-files/
-
-## ACL support
-
-To support copying ACL file information, make sure you have an acl
-development library installed. It also helps to have the helper programs
-installed to manipulate ACLs and to run the rsync testsuite.
-
-## Xattr support
-
-To support copying xattr file information, make sure you have an attr
-development library installed. It also helps to have the helper programs
-installed to manipulate xattrs and to run the rsync testsuite.
-
-## xxhash
-
-The [xxHash library][1] provides extremely fast checksum functions that can
-make the "rsync algorithm" run much more quickly, especially when matching
-blocks in large files.  Installing this development library adds xxhash
-checksums as the default checksum algorithm.  You'll need at least v0.8.0
-if you want rsync to include the full range of its checksum algorithms.
-
-[1]: https://cyan4973.github.io/xxHash/
-
-## zstd
-
-The [zstd library][2] compression algorithm that uses less CPU than
-the default zlib algorithm at the same compression level.  Note that you
-need at least version 1.4, so you might need to skip the zstd compression if
-you can only install a 1.3 release.  Installing this development library
-adds zstd compression as the default compression algorithm.
-
-[2]: http://facebook.github.io/zstd/
-
-## lz4
-
-The [lz4 library][3] compression algorithm that uses very little CPU, though
-it also has the smallest compression ratio of other algorithms.  Installing
-this development library adds lz4 compression as an available compression
-algorithm.
-
-[3]: https://lz4.github.io/lz4/
-
-## openssl crypto
-
-The [openssl crypto library][4] provides some hardware accelerated checksum
-algorithms for MD4 and MD5.  Installing this development library makes rsync
-use the (potentially) faster checksum routines when computing MD4 & MD5
-checksums.
-
-[4]: https://www.openssl.org/docs/man1.0.2/man3/crypto.html
-
-## Package summary
-
-To help you get the libraries installed, here are some package install commands
-for various OSes.  The commands are split up to correspond with the above
-items, but feel free to combine the package names into a single install, if you
-like.
-
- -  For Debian and Ubuntu (Debian Buster users may want to briefly(?) enable
-    buster-backports to update zstd from 1.3 to 1.4):
-
-    >     sudo apt install -y gcc g++ gawk autoconf automake python3-cmarkgfm
-    >     sudo apt install -y acl libacl1-dev
-    >     sudo apt install -y attr libattr1-dev
-    >     sudo apt install -y libxxhash-dev
-    >     sudo apt install -y libzstd-dev
-    >     sudo apt install -y liblz4-dev
-    >     sudo apt install -y libssl-dev
-
-Or run support/install_deps_ubuntu.sh
-
- -  For CentOS (use EPEL for python3-pip):
-
-    >     sudo yum -y install epel-release
-    >     sudo yum -y install gcc g++ gawk autoconf automake python3-pip
-    >     sudo yum -y install acl libacl-devel
-    >     sudo yum -y install attr libattr-devel
-    >     sudo yum -y install xxhash-devel
-    >     sudo yum -y install libzstd-devel
-    >     sudo yum -y install lz4-devel
-    >     sudo yum -y install openssl-devel
-    >     python3 -mpip install --user commonmark
-
- -  For Fedora 33:
-
-    >     sudo dnf -y install acl libacl-devel
-    >     sudo dnf -y install attr libattr-devel
-    >     sudo dnf -y install xxhash-devel
-    >     sudo dnf -y install libzstd-devel
-    >     sudo dnf -y install lz4-devel
-    >     sudo dnf -y install openssl-devel
-
- -  For FreeBSD (this assumes that the python3 version is 3.7):
-
-    >     sudo pkg install -y autotools python3 py37-CommonMark
-    >     sudo pkg install -y xxhash
-    >     sudo pkg install -y zstd
-    >     sudo pkg install -y liblz4
-
- -  For macOS:
-
-    >     brew install automake
-    >     brew install xxhash
-    >     brew install zstd
-    >     brew install lz4
-    >     brew install openssl
-
- -  For Cygwin (with all cygwin programs stopped, run the appropriate setup program from a cmd shell):
-
-    >     setup-x86_64 --quiet-mode -P make,gawk,autoconf,automake,gcc-core,python38,python38-pip
-    >     setup-x86_64 --quiet-mode -P attr,libattr-devel
-    >     setup-x86_64 --quiet-mode -P libzstd-devel
-    >     setup-x86_64 --quiet-mode -P liblz4-devel
-    >     setup-x86_64 --quiet-mode -P libssl-devel
-
-    Sometimes cygwin has commonmark packaged and sometimes it doesn't. Now that
-    its python38 has stabilized, you could install python38-commonmark. Or just
-    avoid the issue by running this from a bash shell as your build user:
-
-    >     python3 -mpip install --user commonmark
-
-## Build and install
-
-After installing the various libraries, you need to configure, build, and
-install the source:
-
->      ./configure
->      make
->      sudo make install
-
-The default install path is /usr/local/bin, but you can set the installation
-directory and other parameters using options to ./configure.  To see them, use:
-
->     ./configure --help
-
-Configure tries to figure out if the local system uses group "nobody" or
-"nogroup" by looking in the /etc/group file.  (This is only used for the
-default group of an rsync daemon, which attempts to run with "nobody"
-user and group permissions.)  You can change the default user and group
-for the daemon by editing the NOBODY_USER and NOBODY_GROUP defines in
-config.h, or just override them in your /etc/rsyncd.conf file.
-
-As of 2.4.7, rsync uses Eric Troan's popt option-parsing library.  A
-cut-down copy of a recent release is included in the rsync distribution,
-and will be used if there is no popt library on your build host, or if
-the `--with-included-popt` option is passed to ./configure.
-
-If you configure using `--enable-maintainer-mode`, then rsync will try
-to pop up an xterm on DISPLAY=:0 if it crashes.  You might find this
-useful, but it should be turned off for production builds.
-
-If you want to automatically use a separate "build" directory based on
-the current git branch name, start with a pristine git checkout and run
-"mkdir auto-build-save" before you run the first ./configure command.
-That will cause a fresh build dir to spring into existence along with a
-special Makefile symlink that allows you to run "make" and "./configure"
-from the source dir (the "build" dir gets auto switched based on branch).
-This is helpful when using the branch-from-patch and patch-update scripts
-to maintain the official rsync patches.  If you ever need to build from
-a "detached head" git position then you'll need to manually chdir into
-the build dir to run make.  I also like to create 2 more symlinks in the
-source dir:  `ln -s build/rsync . ; ln -s build/testtmp .`
-
-## Make compatibility
-
-Note that Makefile.in has a rule that uses a wildcard in a prerequisite.  If
-your make has a problem with this rule, you will see an error like this:
-
-    Don't know how to make ./*.c
-
-You can change the "proto.h-tstamp" target in Makefile.in to list all the \*.c
-filenames explicitly in order to avoid this issue.
-
-## RPM notes
-
-Under packaging you will find .spec files for several distributions.
-The .spec file in packaging/lsb can be used for Linux systems that
-adhere to the Linux Standards Base (e.g., RedHat and others).
-
-## HP-UX notes
-
-The HP-UX 10.10 "bundled" C compiler seems not to be able to cope with
-ANSI C.  You may see this error message in config.log if ./configure
-fails:
-
-    (Bundled) cc: "configure", line 2162: error 1705: Function prototypes are an ANSI feature.
-
-Install gcc or HP's "ANSI/C Compiler".
-
-## Mac OS X notes
-
-Some versions of Mac OS X (Darwin) seem to have an IPv6 stack, but do
-not completely implement the "New Sockets" API.
-
-[This site][5] says that Apple started to support IPv6 in 10.2 (Jaguar).  If
-your build fails, try again after running configure with `--disable-ipv6`.
-
-Apple Silicon macs may install packages in a slightly different location and require flags.
-CFLAGS="-I /opt/homebrew/include" LDFLAGS="-L /opt/homebrew/lib"
-
-[5]: http://www.ipv6.org/impl/mac.html
-
-## IBM AIX notes
-
-IBM AIX has a largefile problem with mkstemp.  See IBM PR-51921.
-The workaround is to append the following to config.h:
-
->     #ifdef _LARGE_FILES
->     #undef HAVE_SECURE_MKSTEMP
->     #endif
@@ -1,77 +1,57 @@
-# The Makefile for rsync (configure creates it from Makefile.in).
+# Makefile for rsync. This is processed by configure to produce the final
+# Makefile

 prefix=@prefix@
 datarootdir=@datarootdir@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
-libdir=@libdir@/rsync
 mandir=@mandir@
-with_rrsync=@with_rrsync@

 LIBS=@LIBS@
 CC=@CC@
-AWK=@AWK@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
-CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@
 EXEEXT=@EXEEXT@
 LDFLAGS=@LDFLAGS@
-LIBOBJDIR=lib/
-AR=@AR@
-ARFLAGS=cr
-RANLIB=@RANLIB@

 INSTALLCMD=@INSTALL@
 INSTALLMAN=@INSTALL@

 srcdir=@srcdir@
-MKDIR_P=@MKDIR_P@
 VPATH=$(srcdir)
 SHELL=/bin/sh

+VERSION=@VERSION@
+
 .SUFFIXES:
 .SUFFIXES: .c .o

-ROLL_SIMD_x86_64=simd-checksum-x86_64.o
-ROLL_ASM_x86_64=simd-checksum-avx2.o
-MD5_ASM_x86_64=lib/md5-asm-x86_64.o
-
-GENFILES=configure.sh aclocal.m4 config.h.in rsync.1 rsync.1.html \
-	 rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html \
-	 @GEN_RRSYNC@
-HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
-	lib/pool_alloc.h lib/mdigest.h lib/md-defines.h vfs/vfs.h
+GENFILES=configure.sh config.h.in proto.h proto.h-tstamp rsync.1 rsyncd.conf.5
+HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h lib/pool_alloc.h
 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
-	lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o lib/acl.o @LIBOBJS@
-zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+	lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
+ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
 	zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
-OBJS1_NO_MAIN=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
-	util1.o util2.o checksum.o match.o log.o backup.o delete.o
-OBJS1=$(OBJS1_NO_MAIN) main.o
+OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+	util.o main.o checksum.o match.o syscall.o log.o backup.o
 OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
-	usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
-OBJS3=progress.o pipe.o @MD5_ASM@ @ROLL_SIMD@ @ROLL_ASM@
+	fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
+OBJS3=progress.o pipe.o
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
-popt_OBJS= popt/popt.o  popt/poptconfig.o \
-	popt/popthelp.o popt/poptparse.o popt/poptint.o
-VFS_OBJ=vfs/vfs.o vfs/dirstack.o vfs/secure_open.o vfs/owner_walk.o vfs/dircache.o vfs/stat.o vfs/rename.o vfs/unlink.o vfs/open.o vfs/chmod.o vfs/symlink.o vfs/link.o vfs/mkdir.o vfs/chown.o vfs/mknod.o vfs/times.o vfs/fileio.o vfs/make_path.o vfs/copy_file.o vfs/robust.o
-OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@ libvfs.a
+popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
+	popt/popthelp.o popt/poptparse.o
+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@

-TLS_OBJ = tls.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ libvfs.a
+TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@

 # Programs we must have to run the test cases
 CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
-	testrun$(EXEEXT) trimslash$(EXEEXT) t_unsafe$(EXEEXT) t_chmod_secure$(EXEEXT) \
-	t_rename_secure$(EXEEXT) t_symlink_secure$(EXEEXT) t_secure_relpath$(EXEEXT) t_acl$(EXEEXT) t_hashtable_overflow$(EXEEXT) t_iwildmatch$(EXEEXT) t_clean_fname$(EXEEXT) t_safe_arg$(EXEEXT) wildtest$(EXEEXT) simdtest$(EXEEXT)
+	trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT)

-CHECK_SYMLINKS = testsuite/chown-fake_test.py testsuite/devices-fake_test.py \
-	testsuite/xattrs-hlink_test.py testsuite/exclude-lsh_test.py
+CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test

 # Objects for CHECK_PROGS to clean
-CHECK_OBJS=tls.o testrun.o getgroups.o getfsdev.o t_stub.o t_unsafe.o t_chmod_secure.o t_rename_secure.o t_symlink_secure.o t_secure_relpath.o t_acl.o t_hashtable_overflow.o t_iwildmatch.o t_clean_fname.o t_safe_arg.o trimslash.o wildtest.o
-# Compile-only feature-shape checks.
-CHECK_COMPILE_OBJS=vfs-no-at-fdcwd.o
+CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o

 # note that the -I. is needed to handle config.h when using VPATH
 .c.o:
@@ -79,110 +59,28 @@ CHECK_COMPILE_OBJS=vfs-no-at-fdcwd.o
 	$(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
@OBJ_RESTORE@

-# NOTE: consider running "packaging/smart-make" instead of "make" to auto-handle
-# any changes to configure.sh and the main Makefile prior to a "make all".
-all: Makefile rsync$(EXEEXT) stunnel-rsyncd.conf @MAKE_RRSYNC@ @MAKE_MAN@
-.PHONY: all
+all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@

-# Compile-check the pre-*at() portability tier.  syscall.c's *at wrappers were
-# split into vfs/, so compile every vfs source with the AT_FDCWD primitives
-# undefined (via vfs/vfs_internal.h's RSYNC_TEST_NO_AT_FDCWD block) and confirm
-# the fallback arms still build.  A shell loop keeps this portable (BSD/Solaris
-# make have no pattern rules); the last object compiled is left as the target.
-# $(VFS_OBJ:.o=.c) is POSIX suffix substitution, portable across makes.
-vfs-no-at-fdcwd.o: $(VFS_OBJ:.o=.c) $(HEADERS) vfs/vfs.h vfs/vfs_internal.h
-	@rm -f $@ $@.tmp
-	@for f in $(VFS_OBJ:.o=.c); do \
-	    echo "  no-AT_FDCWD compile-check: $$f"; \
-	    $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) \
-	        -DRSYNC_TEST_NO_AT_FDCWD -c $(srcdir)/$$f -o $@.tmp || exit 1; \
-	done
-	@mv $@.tmp $@
-
-.PHONY: install
 install: all
-	-$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(INSTALLCMD) $(INSTALL_STRIP) -m 755 rsync$(EXEEXT) $(DESTDIR)$(bindir)
-	$(INSTALLCMD) -m 755 $(srcdir)/rsync-ssl $(DESTDIR)$(bindir)
-	-$(MKDIR_P) $(DESTDIR)$(mandir)/man1
-	-$(MKDIR_P) $(DESTDIR)$(mandir)/man5
-	for fn in rsync.1 rsync-ssl.1; do \
-	    if test -f $$fn; then $(INSTALLMAN) -m 644 $$fn $(DESTDIR)$(mandir)/man1; \
-	    elif test -f $(srcdir)/$$fn; then $(INSTALLMAN) -m 644 $(srcdir)/$$fn $(DESTDIR)$(mandir)/man1; fi; \
-	done
-	for fn in rsyncd.conf.5; do \
-	    if test -f $$fn; then $(INSTALLMAN) -m 644 $$fn $(DESTDIR)$(mandir)/man5; \
-	    elif test -f $(srcdir)/$$fn; then $(INSTALLMAN) -m 644 $(srcdir)/$$fn $(DESTDIR)$(mandir)/man5; fi; \
-	done
-	if test "$(with_rrsync)" = yes; then \
-	    $(INSTALLCMD) -m 755 rrsync $(DESTDIR)$(bindir); \
-	    fn=rrsync.1; \
-	    if test -f $$fn; then $(INSTALLMAN) -m 644 $$fn $(DESTDIR)$(mandir)/man1; \
-	    elif test -f $(srcdir)/$$fn; then $(INSTALLMAN) -m 644 $(srcdir)/$$fn $(DESTDIR)$(mandir)/man1; fi; \
-	fi
-
-install-ssl-daemon: stunnel-rsyncd.conf
-	-$(MKDIR_P) $(DESTDIR)/etc/stunnel
-	$(INSTALLCMD) -m 644 stunnel-rsyncd.conf $(DESTDIR)/etc/stunnel/rsyncd.conf
-	@if ! ls /etc/rsync-ssl/certs/server.* >/dev/null 2>/dev/null; then \
-	    echo "Note that you'll need to install the certificate used by /etc/stunnel/rsyncd.conf"; \
-	fi
-
-install-all: install install-ssl-daemon
+	-mkdir -p ${DESTDIR}${bindir}
+	${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
+	-mkdir -p ${DESTDIR}${mandir}/man1
+	-mkdir -p ${DESTDIR}${mandir}/man5
+	if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
+	if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi

 install-strip:
 	$(MAKE) INSTALL_STRIP='-s' install

-.PHONY: uninstall
-uninstall:
-	rm -f $(DESTDIR)$(bindir)/rsync$(EXEEXT) $(DESTDIR)$(bindir)/rsync-ssl
-	rm -f $(DESTDIR)$(bindir)/rrsync
-	rm -f $(DESTDIR)$(mandir)/man1/rsync.1 $(DESTDIR)$(mandir)/man1/rsync-ssl.1
-	rm -f $(DESTDIR)$(mandir)/man1/rrsync.1
-	rm -f $(DESTDIR)$(mandir)/man5/rsyncd.conf.5
-
-.PHONY: uninstall-ssl-daemon
-uninstall-ssl-daemon:
-	rm -f $(DESTDIR)/etc/stunnel/rsyncd.conf
-
-.PHONY: uninstall-all
-uninstall-all: uninstall uninstall-ssl-daemon
-
 rsync$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)

-rrsync: support/rrsync
-	cp -p $(srcdir)/support/rrsync rrsync
-
 $(OBJS): $(HEADERS)
 $(CHECK_OBJS): $(HEADERS)
-$(VFS_OBJ): $(HEADERS)
-$(VFS_OBJ): vfs/vfs_internal.h
-tls.o xattrs.o: lib/sysxattrs.h
-
-# The VFS layer is bundled into a static archive linked last on every target so
-# that moving a filesystem family between files never breaks a test harness link
-# (the linker pulls only the members each program references).
-libvfs.a: $(VFS_OBJ)
-	rm -f $@
-	$(AR) $(ARFLAGS) $@ $(VFS_OBJ)
-	$(RANLIB) $@
-usage.o: version.h latest-year.h help-rsync.h help-rsyncd.h git-version.h default-cvsignore.h
-loadparm.o: default-dont-compress.h daemon-parm.h

 flist.o: rounding.h
-log.o: rounding.h

-default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
-	$(AWK) -f $(srcdir)/define-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
-
-help-rsync.h help-rsyncd.h: rsync.1.md help-from-md.awk
-	$(AWK) -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
-
-daemon-parm.h: daemon-parm.txt daemon-parm.awk
-	$(AWK) -f $(srcdir)/daemon-parm.awk $(srcdir)/daemon-parm.txt
-
-rounding.h: rounding.c rsync.h proto.h
+rounding.h: rounding.c rsync.h
 	@for r in 0 1 3; do \
 	    if $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/rounding.c >rounding.out 2>&1; then \
 		echo "#define EXTRA_ROUNDING $$r" >rounding.h; \
@@ -200,100 +98,34 @@ rounding.h: rounding.c rsync.h proto.h
 	fi
 	@rm -f rounding.out

-git-version.h: ALWAYS_RUN
-	$(srcdir)/mkgitver
-
-.PHONY: ALWAYS_RUN
-ALWAYS_RUN:
-
-simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
-	@$(srcdir)/cmd-or-msg disable-roll-simd $(CXX) -I. $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
-
-simd-checksum-avx2.o: simd-checksum-avx2.S
-	@$(srcdir)/cmd-or-msg disable-roll-asm $(CC) $(CFLAGS) -I. @NOEXECSTACK@ -c -o $@ $(srcdir)/simd-checksum-avx2.S
-
-lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.S lib/md-defines.h
-	@$(srcdir)/cmd-or-msg disable-md5-asm $(CC) -I. @NOEXECSTACK@ -c -o $@ $(srcdir)/lib/md5-asm-x86_64.S
-
 tls$(EXEEXT): $(TLS_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)

-testrun$(EXEEXT): testrun.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ testrun.o
-
 getgroups$(EXEEXT): getgroups.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS)

 getfsdev$(EXEEXT): getfsdev.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)

-TRIMSLASH_OBJ = trimslash.o util2.o t_stub.o lib/compat.o lib/snprintf.o libvfs.a
+TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib/snprintf.o
 trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)

-T_UNSAFE_OBJ = t_unsafe.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o libvfs.a
+T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o
 t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)

-T_HASHTABLE_OVERFLOW_OBJ = t_hashtable_overflow.o hashtable.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o libvfs.a
-t_hashtable_overflow$(EXEEXT): $(T_HASHTABLE_OVERFLOW_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_HASHTABLE_OVERFLOW_OBJ) $(LIBS)
+gen: conf proto.h man

-T_IWILDMATCH_OBJ = t_iwildmatch.o lib/wildmatch.o
-t_iwildmatch$(EXEEXT): $(T_IWILDMATCH_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_IWILDMATCH_OBJ) $(LIBS)
+gensend: gen
+	rsync -aivzc $(GENFILES) samba.org:/home/ftp/pub/rsync/generated-files/

-T_CLEAN_FNAME_OBJ = t_clean_fname.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o libvfs.a
-t_clean_fname$(EXEEXT): $(T_CLEAN_FNAME_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_CLEAN_FNAME_OBJ) $(LIBS)
+conf:
+	cd $(srcdir) && $(MAKE) -f prepare-source.mak conf

-# safe_arg lives in options.c alongside the whole option parser.  Rather than
-# rely on a non-portable linker --gc-sections to drop the parser (GNU ld only;
-# macOS ld64 and the cygwin PE linker do not), link the real rsync objects so
-# every dep resolves.  t_safe_arg_main.o is main.c with main() renamed out, to
-# supply main.c's globals while letting t_safe_arg.o provide the test's main().
-# OBJS minus main.o is spelled out via OBJS1_NO_MAIN because $(filter-out) is
-# GNU-make-only; BSD and Solaris make expand it to nothing.
-t_safe_arg_main.o: main.c $(HEADERS)
-	$(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -Dmain=rsync_unused_main -c $(srcdir)/main.c -o t_safe_arg_main.o
-T_SAFE_ARG_OBJ = t_safe_arg.o t_safe_arg_main.o $(OBJS1_NO_MAIN) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@ libvfs.a
-t_safe_arg$(EXEEXT): $(T_SAFE_ARG_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_SAFE_ARG_OBJ) $(LIBS)
+conf_stop: configure.sh config.h.in

-T_CHMOD_SECURE_OBJ = t_chmod_secure.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o lib/permstring.o libvfs.a
-t_chmod_secure$(EXEEXT): $(T_CHMOD_SECURE_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_CHMOD_SECURE_OBJ) $(LIBS)
-
-T_RENAME_SECURE_OBJ = t_rename_secure.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o lib/permstring.o libvfs.a
-t_rename_secure$(EXEEXT): $(T_RENAME_SECURE_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_RENAME_SECURE_OBJ) $(LIBS)
-
-T_SYMLINK_SECURE_OBJ = t_symlink_secure.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o lib/permstring.o libvfs.a
-t_symlink_secure$(EXEEXT): $(T_SYMLINK_SECURE_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_SYMLINK_SECURE_OBJ) $(LIBS)
-
-T_SECURE_RELPATH_OBJ = t_secure_relpath.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o lib/permstring.o libvfs.a
-t_secure_relpath$(EXEEXT): $(T_SECURE_RELPATH_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_SECURE_RELPATH_OBJ) $(LIBS)
-
-# Unit test for lib/acl.c: compares our fd/at ACL ops against the system libacl
-# (linked via $(LIBS), which carries -lacl).  lib/acl.o references no rsync
-# globals, so this links with no stubs.  Self-skips (exit 77) when built
-# without SUPPORT_ACL_FD.
-T_ACL_OBJ = t_acl.o lib/acl.o
-t_acl$(EXEEXT): $(T_ACL_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_ACL_OBJ) $(LIBS)
-
-.PHONY: conf
-conf: configure.sh config.h.in
-
-.PHONY: gen
-gen: conf proto.h man git-version.h
-
-aclocal.m4: $(srcdir)/m4/*.m4
-	aclocal -I $(srcdir)/m4
-
-configure.sh config.h.in: configure.ac aclocal.m4
+configure.sh config.h.in: configure.in aclocal.m4
 	@if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
 	@if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
 	autoconf -o configure.sh
@@ -310,7 +142,7 @@ configure.sh config.h.in: configure.ac aclocal.m4
 	else \
 	    echo "config.h.in has CHANGED."; \
 	fi
-	@if test -f configure.sh.old || test -f config.h.in.old; then \
+	@if test -f configure.sh.old -o -f config.h.in.old; then \
 	    if test "$(MAKECMDGOALS)" = reconfigure; then \
 		echo 'Continuing with "make reconfigure".'; \
 	    else \
@@ -320,92 +152,75 @@ configure.sh config.h.in: configure.ac aclocal.m4
 	    fi \
 	fi

-.PHONY: reconfigure
 reconfigure: configure.sh
 	./config.status --recheck
 	./config.status

-.PHONY: restatus
-restatus:
-	./config.status
+make_stop: Makefile

-Makefile: Makefile.in config.status configure.sh config.h.in
+Makefile: Makefile.in config.status
 	@if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
 	@./config.status
 	@if diff Makefile Makefile.old >/dev/null 2>&1; then \
 	    echo "Makefile is unchanged."; \
 	    rm Makefile.old; \
 	else \
-	    if test "$(MAKECMDGOALS)" = reconfigure; then \
-		echo 'Continuing with "make reconfigure".'; \
-	    else \
-		echo "Makefile updated -- rerun your make command."; \
-		exit 1; \
-	    fi \
+	    echo "Makefile updated -- rerun your make command."; \
+	    exit 1; \
 	fi

-stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile
-	sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf
-
-.PHONY: proto
 proto: proto.h-tstamp

 proto.h: proto.h-tstamp
 	@if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi

-proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
-	$(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
+proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
+	perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c

-.PHONY: man
-man: rsync.1 rsync-ssl.1 rsyncd.conf.5 @MAKE_RRSYNC_1@
+man: rsync.1 rsyncd.conf.5
+	@if test -f rsync.1; then :; else cp -p $(srcdir)/rsync.1 .; fi
+	@if test -f rsyncd.conf.5; then :; else cp -p $(srcdir)/rsyncd.conf.5 .; fi

-rsync.1: rsync.1.md md-convert version.h Makefile
-	@$(srcdir)/maybe-make-man rsync.1.md
+rsync.1: rsync.yo
+	yodl2man -o rsync.1 $(srcdir)/rsync.yo
+	-$(srcdir)/tweak_manpage rsync.1

-rsync-ssl.1: rsync-ssl.1.md md-convert version.h Makefile
-	@$(srcdir)/maybe-make-man rsync-ssl.1.md
+rsyncd.conf.5: rsyncd.conf.yo
+	yodl2man -o rsyncd.conf.5 $(srcdir)/rsyncd.conf.yo
+	-$(srcdir)/tweak_manpage rsyncd.conf.5

-rsyncd.conf.5: rsyncd.conf.5.md md-convert version.h Makefile
-	@$(srcdir)/maybe-make-man rsyncd.conf.5.md
-
-rrsync.1: support/rrsync.1.md md-convert Makefile
-	@$(srcdir)/maybe-make-man support/rrsync.1.md
-
-.PHONY: clean
 clean: cleantests
-	rm -f *~ $(OBJS) $(VFS_OBJ) libvfs.a $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_COMPILE_OBJS) $(CHECK_COMPILE_OBJS:.o=.o.tmp) $(CHECK_SYMLINKS) @MAKE_RRSYNC@ \
-		git-version.h rounding rounding.h *.old rsync*.1 rsync*.5 @MAKE_RRSYNC_1@ \
-		*.html daemon-parm.h help-*.h default-*.h proto.h proto.h-tstamp
-	rm -f *.gcno *.gcda lib/*.gcno lib/*.gcda zlib/*.gcno zlib/*.gcda popt/*.gcno popt/*.gcda vfs/*.gcno vfs/*.gcda
-	rm -rf coverage coverage-tcp coverage-all coverage-fallback
+	rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
+		rounding rounding.h *.old

-.PHONY: cleantests
 cleantests:
 	rm -rf ./testtmp*

 # We try to delete built files from both the source and build
 # directories, just in case somebody previously configured things in
 # the source directory.
-.PHONY: distclean
 distclean: clean
-	for dir in $(srcdir) . ; do \
-	    (cd "$$dir" && rm -rf Makefile config.h config.status stunnel-rsyncd.conf \
-	     lib/dummy popt/dummy zlib/dummy config.cache config.log shconfig \
-	     $(GENFILES) autom4te.cache) ; \
-	done
+	rm -f Makefile config.h config.status
+	rm -f lib/dummy popt/dummy zlib/dummy
+	rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/config.status
+	rm -f $(srcdir)/lib/dummy $(srcdir)/popt/dummy $(srcdir)/zlib/dummy
+	rm -f config.cache config.log
+	rm -f $(srcdir)/config.cache $(srcdir)/config.log
+	rm -f shconfig $(srcdir)/shconfig
+	rm -f $(GENFILES)
+	rm -rf autom4te.cache

 # this target is really just for my use. It only works on a limited
 # range of machines and is used to produce a list of potentially
 # dead (ie. unused) functions in the code. (tridge)
-.PHONY: finddead
 finddead:
 	nm *.o */*.o |grep 'U ' | awk '{print $$2}' | sort -u > nmused.txt
 	nm *.o */*.o |grep 'T ' | awk '{print $$3}' | sort -u > nmfns.txt
 	comm -13 nmused.txt nmfns.txt
-	@rm nmused.txt nmfns.txt

 # 'check' is the GNU name, 'test' is the name for everybody else :-)
-.PHONY: test
+.PHONY: check test
+
 test: check

 # There seems to be no standard way to specify some variables as
@@ -418,180 +233,28 @@ test: check
 # catch Bash-isms earlier even if we're running on GNU.  Of course, we
 # might lose in the future where POSIX diverges from old sh.

-# `make check` runs tests in parallel by default. Override with
-# `make check CHECK_J=1` (serial) or any other value.
-CHECK_J = 8
+check: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
+	rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh

-# Parallelism for `make coverage`. Defaults to the same as CHECK_J: the
-# coverage build sets -fprofile-update=atomic (atomic in-memory counters) and
-# gcc's libgcov serializes the per-source .gcda read-modify-write merge with a
-# file lock, so concurrent rsync processes (incl. the forked sender/generator/
-# receiver) accumulate exactly -- verified by a count-linearity check (a hot
-# line accumulates identically at -j1 and -P16). Override with
-# `make coverage COVERAGE_J=1` if your libgcov does not lock .gcda merges.
-COVERAGE_J = $(CHECK_J)
+check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
+	rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29

-# Output directory and extra runtests.py flags for `make coverage`. The
-# `coverage-tcp` target reuses the coverage recipe with --use-tcp (real
-# loopback rsyncd, which exercises the TCP accept/auth path and the
-# require_tcp-only tests) and a separate output directory.
-COVERAGE_DIR = coverage
-COVERAGE_RUNFLAGS =
-
-# Excluded from the coverage report so the percentages reflect rsync's own
-# runtime source.  Three buckets:
-#  (1) Bundled third-party code rsync ships but does not own: zlib/, popt/, and
-#      the named lib/ imports (PostgreSQL getaddrinfo, ISC inet_ntop/inet_pton,
-#      standalone getpass).  The other lib/*.c are rsync's own and stay in.
-#  (2) Test-helper / build-time programs that link against rsync objects but are
-#      not the rsync runtime: t_*.c, tls.c, wildtest.c, testrun.c, getgroups.c,
-#      getfsdev.c, trimslash.c, rounding.c.  These have their own main() and are
-#      either driven directly by a test (counted there) or are configure-time
-#      probes; counting them as "rsync uncovered" is noise.
-#  (3) Compile-time-dead fallbacks under this build's config.h: lib/md5.c (the
-#      reference md5 -- openssl's EVP path is used when HAVE_OPENSSL) and
-#      lib/snprintf.c (only the #include line survives under
-#      HAVE_C99_VSNPRINTF).  Covering these would mean a separate non-openssl /
-#      non-C99 build, which is out of scope for this report.
-COVERAGE_EXCLUDE = -e '(^|/)zlib/' -e '(^|/)popt/' \
-	-e '(^|/)lib/(getaddrinfo|getpass|inet_ntop|inet_pton)\.' \
-	-e '(^|/)(t_[a-z_]+|tls|wildtest|testrun|getgroups|getfsdev|trimslash|rounding)\.c$$' \
-	-e '(^|/)lib/(md5|snprintf)\.c$$'
-
-# Build everything the test suite needs (rsync + helper programs + symlinks)
-# WITHOUT running it. Used by CI jobs that invoke runtests.py directly with
-# custom options (e.g. the version-mix workflow's --rsync-bin2/--expect-result).
-.PHONY: check-progs
-check-progs: all $(CHECK_PROGS) $(CHECK_COMPILE_OBJS) $(CHECK_SYMLINKS)
-
-.PHONY: check
-check: all $(CHECK_PROGS) $(CHECK_COMPILE_OBJS) $(CHECK_SYMLINKS)
-	"$(srcdir)/runtests.py" --rsync-bin="`pwd`/rsync$(EXEEXT)" -j $(CHECK_J)
-
-.PHONY: check29
-check29: all $(CHECK_PROGS) $(CHECK_COMPILE_OBJS) $(CHECK_SYMLINKS)
-	"$(srcdir)/runtests.py" --rsync-bin="`pwd`/rsync$(EXEEXT)" -j $(CHECK_J) --protocol=29
-
-.PHONY: check30
-check30: all $(CHECK_PROGS) $(CHECK_COMPILE_OBJS) $(CHECK_SYMLINKS)
-	"$(srcdir)/runtests.py" --rsync-bin="`pwd`/rsync$(EXEEXT)" -j $(CHECK_J) --protocol=30
-
-# Whole-suite gcov coverage report (HTML, with branch + decision coverage).
-# Requires a build configured with --enable-coverage and the `gcovr` tool
-# (pip install gcovr). Runs the suite in parallel (COVERAGE_J, default CHECK_J):
-# this is safe because the coverage build uses -fprofile-update=atomic and
-# libgcov locks the per-source .gcda during its merge, so concurrent rsync
-# processes accumulate exactly (see COVERAGE_J above). Use COVERAGE_J=1 if your
-# toolchain's libgcov does not lock .gcda merges.
-.PHONY: coverage
-coverage: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	@case '$(CFLAGS)' in *--coverage*) ;; \
-	  *) echo "*** not a coverage build; reconfigure with --enable-coverage"; exit 1 ;; esac
-	@command -v gcovr >/dev/null 2>&1 || { echo "*** gcovr not found (pip install gcovr)"; exit 1; }
-	find . -name '*.gcda' -delete
-	@# Daemon modules with `uid = <non-root>` setuid the per-connection child
-	@# (and so the forked generator/receiver), which then cannot create or
-	@# merge .gcda files in a root-owned build dir -- silently dropping ALL
-	@# coverage from those processes.  Make every .gcno's directory
-	@# world-writable so any uid can create the sibling .gcda, and set a
-	@# default ACL of o::rw so the .gcda are world-mergeable regardless of
-	@# the creator's umask (every test process resets umask to 022 via
-	@# rsyncfns.py, so a Makefile-level `umask 0` would not survive).
-	@find . -name '*.gcno' -printf '%h\n' 2>/dev/null | sort -u | \
-	  while read d; do \
-	    chmod a+rwx "$$d"; \
-	    setfacl -m 'd:u::rwx,d:g::rwx,d:o::rwx' "$$d" 2>/dev/null || true; \
-	  done
-	@rc=0; "$(srcdir)/runtests.py" --rsync-bin="`pwd`/rsync$(EXEEXT)" -j $(COVERAGE_J) $(COVERAGE_RUNFLAGS) || rc=$$?; \
-	  rm -rf $(COVERAGE_DIR) && mkdir -p $(COVERAGE_DIR); \
-	  gcovr --root $(srcdir) $(COVERAGE_EXCLUDE) --decisions --print-summary \
-	      --gcov-ignore-parse-errors=negative_hits.warn_once_per_file \
-	      --html-details -o $(COVERAGE_DIR)/index.html . || exit $$?; \
-	  echo "Coverage report written to $(COVERAGE_DIR)/index.html"; \
-	  if test $$rc != 0; then \
-	    echo "*** test suite FAILED (status $$rc) -- coverage report still written above"; \
-	  fi; \
-	  exit $$rc
-
-# Same as `make coverage` but with the daemon tests run over a real loopback
-# rsyncd (--use-tcp), into a separate report directory.
-.PHONY: coverage-tcp
-coverage-tcp:
-	$(MAKE) coverage COVERAGE_RUNFLAGS=--use-tcp COVERAGE_DIR=coverage-tcp
-
-# Comprehensive single report: run the suite under several configurations,
-# accumulating into the shared .gcda counters (NOT cleared between runs), then
-# emit one merged, rsync-scoped report. Covers the default (pipe) transport, the
-# protocol-29/30 compat branches, and the real-TCP daemon path (which also runs
-# the require_tcp-only tests). Run under sudo to additionally cover root-only
-# paths (devices, chown, use-chroot, protected-regular). Local target -- CI uses
-# the plain `coverage`/`coverage-tcp` targets.
-.PHONY: coverage-all
-coverage-all: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	@case '$(CFLAGS)' in *--coverage*) ;; \
-	  *) echo "*** not a coverage build; reconfigure with --enable-coverage"; exit 1 ;; esac
-	@command -v gcovr >/dev/null 2>&1 || { echo "*** gcovr not found (pip install gcovr)"; exit 1; }
-	find . -name '*.gcda' -delete
-	@# See the `coverage` target above for why: setuid'd daemon children must
-	@# be able to create/merge .gcda owned by a different uid.
-	@find . -name '*.gcno' -printf '%h\n' 2>/dev/null | sort -u | \
-	  while read d; do \
-	    chmod a+rwx "$$d"; \
-	    setfacl -m 'd:u::rwx,d:g::rwx,d:o::rwx' "$$d" 2>/dev/null || true; \
-	  done
-	@rc=0; \
-	  for cfg in '' '--protocol=30' '--protocol=29' '--use-tcp'; do \
-	    echo "===== coverage-all: runtests.py $$cfg ====="; \
-	    "$(srcdir)/runtests.py" --rsync-bin="`pwd`/rsync$(EXEEXT)" -j $(COVERAGE_J) $$cfg || rc=$$?; \
-	  done; \
-	  rm -rf coverage-all && mkdir -p coverage-all; \
-	  gcovr --root $(srcdir) $(COVERAGE_EXCLUDE) --decisions --print-summary \
-	      --gcov-ignore-parse-errors=negative_hits.warn_once_per_file \
-	      --html-details -o coverage-all/index.html . || exit $$?; \
-	  echo "Merged coverage report written to coverage-all/index.html"; \
-	  if test $$rc != 0; then \
-	    echo "*** some suite runs FAILED (status $$rc) -- report still written above"; \
-	  fi; \
-	  exit $$rc
-
-# Coverage for the portable (non-openat2) resolver tier. Requires a SEPARATE
-# build configured with --enable-coverage --disable-openat2: its .gcno differ
-# from the openat2 build, so this report cannot be merged with the others.
-.PHONY: coverage-fallback
-coverage-fallback:
-	$(MAKE) coverage COVERAGE_DIR=coverage-fallback
-
-wildtest.o: wildtest.c t_stub.o lib/wildmatch.c rsync.h config.h
+wildtest.o: wildtest.c lib/wildmatch.c rsync.h config.h
 wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ $(LIBS)

-simdtest$(EXEEXT): simd-checksum-x86_64.cpp $(HEADERS)
-	@if test x"@ROLL_SIMD@" != x; then \
-	    $(CXX) -I. $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -DTEST_SIMD_CHECKSUM1 \
-	        -o $@ $(srcdir)/simd-checksum-x86_64.cpp @ROLL_ASM@ $(LIBS); \
-	else \
-	    touch $@; \
-	fi
+testsuite/chown-fake.test:
+	ln -s chown.test $(srcdir)/testsuite/chown-fake.test

-testsuite/chown-fake_test.py:
-	ln -s chown_test.py $(srcdir)/testsuite/chown-fake_test.py
-
-testsuite/devices-fake_test.py:
-	ln -s devices_test.py $(srcdir)/testsuite/devices-fake_test.py
-
-testsuite/xattrs-hlink_test.py:
-	ln -s xattrs_test.py $(srcdir)/testsuite/xattrs-hlink_test.py
-
-testsuite/exclude-lsh_test.py:
-	ln -s exclude_test.py $(srcdir)/testsuite/exclude-lsh_test.py
+testsuite/devices-fake.test:
+	ln -s devices.test $(srcdir)/testsuite/devices-fake.test

 # This does *not* depend on building or installing: you can use it to
 # check a version installed from a binary or some other source tree,
 # if you want.

-.PHONY: installcheck
 installcheck: $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	"$(srcdir)/runtests.py" --rsync-bin="$(bindir)/rsync$(EXEEXT)" --srcdir="$(srcdir)" --tooldir="`pwd`" -j $(CHECK_J)
+	POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/rsync$(EXEEXT)" srcdir="$(srcdir)" $(srcdir)/runtests.sh

 # TODO: Add 'dist' target; need to know which files will be included

@@ -600,12 +263,21 @@ installcheck: $(CHECK_PROGS) $(CHECK_SYMLINKS)
 splint:
 	splint +unixlib +gnuextensions -weak rsync.c

-.PHONY: doxygen
+
+rsync.dvi: doc/rsync.texinfo
+	texi2dvi -o $@ $<
+
+rsync.ps: rsync.dvi
+	dvips -ta4 -o $@ $<
+
+rsync.pdf: doc/rsync.texinfo
+	texi2dvi -o $@ --pdf $<
+
+
 doxygen:
 	cd $(srcdir) && rm dox/html/* && doxygen

 # for maintainers only
-.PHONY: doxygen-upload
 doxygen-upload:
 	rsync -avzv $(srcdir)/dox/html/ --delete \
-	$${RSYNC_SAMBA_HOST-samba.org}:/home/httpd/html/rsync/doxygen/head/
+	samba.org:/home/httpd/html/rsync/doxygen/head/
@@ -0,0 +1,62 @@
+NEWS for rsync 3.0.5 (28 Dec 2008)
+Protocol: 30 (unchanged)
+Changes since 3.0.4:
+
+  BUG FIXES:
+
+    - Initialize xattr data in a couple spots in the hlink code, which avoids a
+      crash when the xattr pointer's memory happens to start out non-zero.
+      Also fixed the itemizing of an alt-dest file's xattrs when hard-linking.
+
+    - Don't send a bogus "-" option to an older server if there were no short
+      options specified.
+
+    - Fixed skipping of unneeded updates in a batch file when incremental
+      recursion is active.  Added a test for this.  Made batch-mode handle
+      "redo" files properly (and without hanging).
+
+    - Fix the %P logfile escape when the daemon logs from inside a chroot.
+
+    - Fixed the use of -s (--protect-args) when used with a remote source or
+      destination that had an empty path (e.g. "host:").  Also fixed a problem
+      when -s was used when accessing a daemon via a remote-shell.
+
+    - Fixed the use of a dot-dir path (e.g. foo/./bar) inside a --files-from
+      file when the root of the transfer isn't the current directory.
+
+    - Fixed a bug with "-K --delete" removing symlinks to directories when
+      incremental recursion is active.
+
+    - Fixed a hard to trigger hang when using --remove-source-files.
+
+    - Got rid of an annoying delay when accessing a daemon via a remote-shell.
+
+    - Properly ignore (superfluous) source args on a --read-batch command.
+
+    - Improved the manpage's description of the '*' wildcard to remove the
+      confusing "non-empty" qualifier.
+
+    - Fixed reverse lookups in the compatibility-library version of
+      getnameinfo().
+
+    - Fixed a bug when using --sparse on a sparse file that has over 2GB of
+      consecutive sparse data.
+
+    - Avoid a hang when using at least 3 --verbose options on a transfer with a
+      client sender (which includes local copying).
+
+    - Fixed a problem with --delete-delay reporting an error when it was ready
+      to remove a directory that was now gone.
+
+    - Got rid of a bunch of "warn_unused_result" compiler warnings.
+
+    - If an ftruncate() on a received file fails, it now causes a partial-
+      transfer warning.
+
+    - Allow a path with a leading "//" to be preserved (CYGWIN only).
+
+  ENHANCEMENTS:
+
+    - Made the support/atomic-rsync script able to perform a fully atomic
+      update of the copied hierarchy when the destination is setup using a
+      particular symlink idiom.
@@ -23,18 +23,8 @@ options.  To get a complete list of supported options type:

    rsync --help

-See the [manpage][0] for more detailed information.
+See the manpage for more detailed information.

-[0]: https://download.samba.org/pub/rsync/rsync.1
-
-BUILDING AND INSTALLING
-----------------------
-
-If you need to build rsync yourself, check out the [INSTALL][1] page for
-information on what libraries and packages you can use to get the maximum
-features in your build.
-
-[1]: https://github.com/RsyncProject/rsync/blob/master/INSTALL.md

 SETUP
 -----
@@ -65,17 +55,17 @@ RSYNC DAEMONS
 -------------

 Rsync can also talk to "rsync daemons" which can provide anonymous or
-authenticated rsync.  See the rsyncd.conf(5) manpage for details on how
-to setup an rsync daemon.  See the rsync(1) manpage for info on how to
+authenticated rsync.  See the rsyncd.conf(5) man page for details on how
+to setup an rsync daemon.  See the rsync(1) man page for info on how to
 connect to an rsync daemon.


 WEB SITE
 --------

-For more information, visit the [main rsync web site][2].
+The main rsync web site is here:

-[2]: https://rsync.samba.org/
+    http://rsync.samba.org/

 You'll find a FAQ list, downloads, resources, HTML versions of the
 manpages, etc.
@@ -87,69 +77,64 @@ MAILING LISTS
 There is a mailing list for the discussion of rsync and its applications
 that is open to anyone to join.  New releases are announced on this
 list, and there is also an announcement-only mailing list for those that
-want official announcements.  See the [mailing-list page][3] for full
-details.
+want official announcements.  See the mailing-list page for full
+details:

-[3]: https://rsync.samba.org/lists.html
-
-
-DISCORD
-------
-
-There is also an rsync [Discord server][d] for real-time chat about rsync
-and its development.
-
-[d]: https://discord.gg/Avfvy9zhdp
+    http://rsync.samba.org/lists.html


 BUG REPORTS
 -----------

-The [bug-tracking web page][4] has full details on bug reporting.
+To visit this web page for full the details on bug reporting:

-[4]: https://rsync.samba.org/bug-tracking.html
+    http://rsync.samba.org/bugzilla.html

-That page contains links to the current bug list, and information on how to
-do a good job when reporting a bug.  You might also like to try searching
-the Internet for the error message you've received, or looking in the
-[mailing list archives][5].
+That page contains links to the current bug list, and information on how
+to report a bug well.  You might also like to try searching the Internet
+for the error message you've received, or looking in the mailing list
+archives at:

-[5]: https://mail-archive.com/rsync@lists.samba.org/
+    http://mail-archive.com/rsync@lists.samba.org/

 To send a bug report, follow the instructions on the bug-tracking
 page of the web site.

-Alternately, email your bug report to <rsync@lists.samba.org>.
+Alternately, email your bug report to rsync@lists.samba.org .

-For security issues please email details of the issue to <rsync.project@gmail.com>.

 GIT REPOSITORY
 --------------

 If you want to get the very latest version of rsync direct from the
-source code repository, then you will need to use git.  The git repo
-is hosted [on GitHub][6] and [on Samba's site][7].
+source code repository then you can use git:

-[6]: https://github.com/RsyncProject/rsync
-[7]: https://git.samba.org/?p=rsync.git;a=summary
+    git clone git://git.samba.org/rsync.git

-See [the download page][8] for full details on all the ways to grab the
-source.
+See the download page for full details on all the ways to grab the
+source, including nightly tar files, web-browsing of the git repository,
+etc.:

-[8]: https://rsync.samba.org/download.html
+    http://rsync.samba.org/download.html


 COPYRIGHT
 ---------

-Rsync was originally written by Andrew Tridgell and Paul Mackerras.  Many
-people from around the world have helped to maintain and improve it.
-
-Special thanks go to Wayne Davison, who maintained rsync from 2004 to 2024.
+Rsync was originally written by Andrew Tridgell and is currently
+maintained by Wayne Davison.   It has been improved by many developers
+from around the world.

 Rsync may be used, modified and redistributed only under the terms of
-the GNU General Public License, found in the file [COPYING][9] in this
-distribution, or at [the Free Software Foundation][10].
+the GNU General Public License, found in the file COPYING in this
+distribution, or at:

-[9]: https://github.com/RsyncProject/rsync/blob/master/COPYING
-[10]: https://www.fsf.org/licenses/gpl.html
+    http://www.fsf.org/licenses/gpl.html
+
+
+AVAILABILITY
+------------
+
+The main web site for rsync is http://rsync.samba.org/
+The main ftp site is ftp://rsync.samba.org/pub/rsync/
+This is also available as rsync://rsync.samba.org/rsyncftp/
@@ -1,542 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Only the current release of the software is actively supported.  If you need
-help backporting fixes into an older release, feel free to ask.
-
-## Reporting a Vulnerability
-
-Email your vulnerability information to rsync's maintainer:
-
-  Rsync Project <rsync.project@gmail.com>
-
-
-## Approach to platform residuals
-
-rsync hardens its security-sensitive operations — path resolution, metadata
-application, file/socket creation — against local attacks such as parent-symlink
-TOCTOU races. Some of these operations can only be made race-safe with a
-primitive the underlying OS provides (an `*at()` syscall on a held directory fd,
-an fdescfs-style `/proc/self/fd` magic symlink, `mknodat()`, the `*xattrat`
-syscalls, and so on), and that primitive is not available on every supported
-platform.
-
-The guiding rule for those cases is:
-
-> **On a modern Linux system every issue described in this document is fully
-> addressed.** Where an operation *can* be secured on some platforms but *cannot*
-> be secured on others, and the residual risk is a *local* privilege-escalation
-> or data-disclosure class (an attacker who already has write access inside the
-> transferred tree), rsync prefers keeping the operation functional on the
-> platforms that lack the primitive over disabling a long-standing feature for
-> everyone on those platforms.
-
-So a hardened operation takes the race-safe path wherever the platform offers one
-and falls back to the historical (path-based, unconfined) behaviour only where it
-does not — rather than refusing the operation outright. Each such fallback is an
-accepted residual, documented under "Known residuals" below, and on the daemon it
-can be turned off per feature with `refuse options = ...`. The residuals are
-therefore confined to non-Linux platforms (the BSDs, macOS, Solaris/illumos),
-Cygwin, and — for a few features — pre-6.13 Linux kernels; a current, normally
-configured Linux deployment carries none of them. (The `/proc/self/fd`-based
-fallbacks assume a mounted `/proc`, which every standard Linux provides; a
-deliberately `/proc`-less container is the one Linux case that can still hit a
-residual.)
-
-The one deliberate exception is an operation whose unconfined fallback would
-*create a new filesystem object at an attacker-influenceable path* rather than set
-metadata on the object rsync already transferred: the nested-socket `bind()` on
-platforms without a race-safe socket-create (no `bindat()`). There the unsafe path
-is an out-of-tree write/create primitive, not a same-object metadata race, and a
-transferred socket inode is a worthless placeholder, so rsync refuses (skips) it
-rather than keeping it functional. A leaf permission change is likewise failed
-closed rather than applied through a raced symlink, but only as a rare backstop:
-the common file/dir/FIFO case is secured on every platform via `fchmod` on a held
-fd, so no real functionality is lost.
-
-This trade-off applies only to these local-attacker residual classes. Remotely
-reachable defects — memory safety, authentication bypass, protocol parsing, input
-bounds — are fixed unconditionally on all platforms, never left as a residual.
-
-
-## Robustness against malicious peers
-
-rsync treats everything the peer sends — the file list, checksum headers,
-multiplexed messages, forwarded daemon arguments, filter rules — as untrusted,
-and bounds-checks it before use. A peer-triggerable crash of a connection's
-worker process is treated as a defect to be fixed, even though the daemon's
-fork-per-connection model confines such a fault to that one connection rather
-than the whole service.
-
-Alongside the issues enumerated elsewhere in this document, the code is hardened
-continuously through protocol fuzzing (driving the daemon protocol against a
-writable module) and static analysis, with a CI gate. This release closes a
-batch of peer-triggerable faults found that way: NULL-dereference and
-reachable-assert crashes from crafted file lists or indices, reads past a
-file-list allocation (mostly bounded over-reads of an entry's extra slots),
-unbounded merge-file and suffix-list recursion, and several bounded
-out-of-bounds writes driven by peer-supplied lengths or option arguments. Each
-is fixed at the root with a bounds or validity check plus a defence-in-depth
-guard at the use site, and carries a regression test.
-
-Two further peer-input hardenings in this release: a peer-supplied I/O-error
-value (the `MSG_IO_ERROR` message and the file-list trailer) is masked to the
-defined `IOERR_*` bits, so a peer cannot set arbitrary error flags in the local
-`io_error` that would be stored and re-forwarded upstream; and control
-characters in a (peer-controlled) filename written to the log file are escaped,
-so a name carrying C0/C1 terminal-escape bytes cannot inject sequences into an
-administrator's terminal when the log is viewed (CWE-117). The number of
-equal-weak-checksum blocks `hash_search()` examines per offset is also bounded
-(issue #217), so a crafted or degenerate checksum set with a very long
-equal-checksum chain cannot drive the sender's per-offset match-verify into a
-quadratic walk and pin one connection's CPU.
-
-Contributors adding code that consumes peer input should validate it at the
-point of receipt rather than relying on a downstream check.
-
-
-## Symlink-race-safe path resolution
-
-This section documents how rsync defends against parent-directory symlink races
-(a TOCTOU / confused-deputy class) and the per-platform approach it takes, so
-that contributors and automated agents extend the code consistently rather than
-reintroducing the weakness.
-
-### The threat
-
-Many rsync operations resolve pathnames that an unprivileged party can partially
-control: a receiver writing into a destination tree, a sender reading a source
-tree, and temp and partial files, and so on. (The operator-chosen directory
-paths — `--link-dest`/`--compare-dest`/`--copy-dest`/`--backup-dir`/`--temp-dir`/
-`--partial-dir` — may legitimately point outside the tree, so they are resolved
-by the ownership walk described under *Symlink defense for operator-supplied
-paths* below rather than the strict transfer-path resolver here.) If someone who
-can write inside that tree races a
-parent directory component between a real directory and a symlink ("symlink
-flipping"), a path-based syscall — `open`, `stat`, `chmod`, `chown`, `utimes`,
-`rename`, `unlink`, `mkdir`, `mknod`, `symlink`, hard-link creation — can be
-redirected to a target *outside* the intended tree. When rsync resolves that
-path with more authority than the component's controller and without a
-confinement boundary, this is a confused-deputy bug (e.g. a root nightly backup
-capturing `/etc/shadow`, or a root receiver chmod/chown/unlink-ing a system
-file).
-
-`O_NOFOLLOW` on the final component is **not** sufficient: the *parent*
-components must be resolved safely.
-
-The boundary that matters is **authority plus confinement**, not "daemon vs
-non-daemon". A non-chroot daemon module, a root-run local transfer, and a
-two-user transfer are all unconfined privileged path resolvers. Where a real
-confinement boundary already exists (e.g. a per-module `chroot`) that is the
-strongest protection; otherwise rsync must resolve paths defensively.
-
-A `chroot` is only a boundary for the *outer* path it confines. A daemon module
-written as `path = /outer/./inner` (`use chroot = yes`) chroots to `/outer` but
-treats `/inner` as the module root, so a symlink inside the module that points to
-a sibling of `/inner` is still inside the chroot yet outside the module — the
-inner module therefore needs the same defensive resolution as a non-chroot
-module. The single gate that decides when hardened resolution applies is
-"unconfined privileged resolver": `am_daemon && (!am_chrooted || module_dirlen)`
-for the daemon (any non-chroot module, plus a `/./` inner-module chroot), and any
-non-chroot receiver. The local sender's content open is confined the same way for
-default symlink handling; only the symlink-following modes (`-L`/`--copy-links`/
-`--copy-unsafe-links`/`-k`) and `--insecure-links` are excluded, so those keep
-following symlinks by design.
-
-### The mechanism
-
-Resolution of attacker-influenceable paths goes through `secure_relative_open()`
-and the `do_*_at()` wrappers in `syscall.c`, never a raw `open()`/`rename()`/
-`chmod()` on a full path string. The principle is: **trust the operator-named
-transfer root, and confine all resolution beneath it**, rejecting escapes via
-`..` above the anchor, absolute symlinks, or out-of-tree symlinks.
-`secure_relative_open()` resolves the parent directory by walking it one
-component at a time on a stack of held directory fds, then operates on the final
-component with an at-style call on the resulting directory fd.
-
-For per-entry work the receiver and generator go one step further and hold the
-parent directory open: `open_dir_secure()` resolves an entry's directory once
-(via `secure_relative_open()`), `held_dfd_for()` caches that descriptor for the
-duration of the entry, and every operation on the entry — `lstat`, the temp-file
-`mkstemp`, the temp->final `rename`, `chmod`/`chown`/`utimes`, `mkdir`, special-
-file and symlink creation, the delta-basis open, and the recursive delete — runs
-through that one held fd via an `*at()` call (`do_*_atfd()`). Because the
-descriptor is pinned to the directory inode, a parent component flipped to a
-symlink *after* the open cannot redirect any of those operations. The alternate-
-destination lookups are confined the same way (`basis_link_stat()` in
-`generator.c` and `secure_basis_open()` in `receiver.c`), so a peer-chosen
-`--link-dest`/`--compare-dest`/`--copy-dest` basis index cannot reach an
-out-of-module file through a symlinked parent.
-
-The sender's source-directory *enumeration* is confined the same way as its
-content open. `send_directory()` opens each scanned directory through
-`secure_opendir()` — which resolves it via `secure_relative_open()` /
-`secure_relative_open_at()` and turns the held fd into the `DIR*` with
-`fdopendir()` — so a parent component raced into a symlink, or (for a daemon
-following mode) an in-module symlink pointing outside the module, cannot redirect
-the scan to enumerate an out-of-tree directory and leak its entry names, metadata
-and symlink targets. For a daemon, both the enumeration and the content open
-anchor at the served module root **pinned by identity**: `module_dirfd` is opened
-(`open(".")`) the moment the daemon `chdir`s into the module, while still
-privileged, and module-relative paths resolve beneath that fd via
-`secure_relative_open_at()`. Anchoring at the held fd rather than re-resolving the
-absolute module path keeps the confinement working after the daemon drops to the
-module uid even when the module sits under a directory that uid cannot traverse
-(e.g. a `0700` home — re-resolving the absolute path would `EACCES`), and is
-immune to the logical-path-versus-real-cwd skew a followed in-tree directory
-symlink would otherwise introduce.
-
-### Path resolution
-
-`secure_relative_open()` resolves a path with a single portable mechanism on
-every platform: a per-component walk on a stack of held directory fds. Each
-component is opened relative to the held parent with `openat(parent_fd,
-"component", O_NOFOLLOW)`; descending into a real subdirectory pushes its fd, a
-`..` pops back to the already-held parent (a pop at the anchor is refused), and an
-in-tree directory symlink is followed by reading its target and walking that off
-the same stack (absolute targets refused, symlink hops bounded). The final
-component is opened `O_NOFOLLOW`.
-
-Because every component is opened relative to a *pinned* fd under `O_NOFOLLOW`,
-and `..` is resolved by the held-fd stack rather than by the kernel, the walk is
-race-free by construction: no rename or symlink swap of any path name can redirect
-resolution outside the anchor subtree, and no kernel "beneath" primitive
-(`openat2(RESOLVE_BENEATH)` / `openat(O_RESOLVE_BENEATH)`) is required. The
-confinement is therefore uniform across Linux, the BSDs, macOS and
-Solaris/illumos, on old and new kernels alike, with nothing to probe or fall back
-to at runtime (and so no `openat2`/seccomp interaction to worry about in sandboxed
-environments).  Cygwin is the exception, because its directory descriptors and
-symlink emulation do not give the held-fd walk the same inode pinning — see the
-Cygwin residual below.
-
-Legitimate *in-tree* directory symlinks are followed, so `--keep-dirlinks` /
-`--copy-links` and a symlinked module path keep working. A relative alternate-dest
-such as `--compare-dest=../01` may legitimately climb to a sibling still inside the
-module; such a `..` path is re-anchored at the module root and its in-module climb
-adjudicated by the walk (the `..` pops to the held parent), while escapes above the
-anchor are still rejected.
-
-### Leaf operations
-
-The final operation is hardened as well, following `cp`: reads use `O_NOFOLLOW`
-so a flipped leaf symlink is not followed, and new or destination files are
-created with `O_CREAT|O_EXCL` (rsync's temporary files use `mkstemp`) so a
-planted symlink at the target cannot be written through. A leaf `chmod` is the
-one operation with no portable no-follow form: it is closed by opening the leaf
-`O_RDONLY|O_NOFOLLOW` and `fchmod`-ing the held fd (refusing a symlink leaf with
-`ELOOP`), falling back to `fchmodat(AT_SYMLINK_NOFOLLOW)` and then the
-`fchmodat2()` syscall, and failing closed with a warning rather than ever
-chmod-ing through a raced leaf symlink.
-
-### Guidance for contributors
-
-* When adding code that performs a path-based syscall on a path that can be
-  influenced by the remote peer or by another local user, use a `do_*_at()`
-  wrapper (or `secure_relative_open()`), not a raw full-path syscall.
-* When introducing a new operation, add a matching `do_<op>_at()` wrapper that
-  resolves the parent with `secure_relative_open()` and acts via an at-style call
-  on the returned dirfd.
-* Do not assume a non-daemon transfer is safe; the question is whether rsync has
-  more authority than whoever controls the path components.
-* On platforms whose API lacks an at-style equivalent (e.g. `setattrlist()`),
-  follow the residuals policy at the top of this document: for a metadata
-  operation on the already-transferred object (ACLs, xattrs, crtimes, permissions)
-  fall back to the path-based call to keep the feature functional and document the
-  residual; but where the unsafe fallback would *create a new object on an
-  unconfined path* (the nested-socket `bind()` case), refuse it instead — that is
-  an out-of-tree write/create primitive, not a same-object metadata race, and the
-  lost functionality is negligible.
-
-
-## Symlink defense for operator-supplied paths
-
-rsync opens several operator-supplied paths during normal operation.  These fall
-into two groups, both governed by the same ownership-walk policy below:
-
-* operator **files**: `--log-file`, `--password-file`, `--early-input` (a client
-  read whose contents are forwarded to the daemon's early-exec), `--files-from`,
-  `--include-from`, `--exclude-from`, `--filter=. file`, `--write-batch`,
-  `--read-batch`, per-directory filter merge files (`-C` / `-F` / `dir-merge`),
-  and on the daemon side `motd file =`, `secrets file =`, `lock file =`, and
-  `rsyncd.conf` itself.
-* operator **directories**: `--backup-dir`, `--temp-dir`/`-T`, `--partial-dir`,
-  and the `--link-dest`/`--compare-dest`/`--copy-dest` basis lookup.  These take
-  a directory the operator chose, which may legitimately point outside the
-  transfer tree (`--backup-dir=/var/backups`), so they are resolved with the
-  ownership walk rather than the strict transfer-path resolver.
-
-The daemon module-root `chdir()` under
-`use chroot = no` and the non-daemon receiver's `chdir()` into the
-operator-named destination directory are in the same class: both follow
-the operator's/root's own symlinked target (the `/backup -> /mnt/disk`
-admin pattern) but refuse one an attacker raced in from another uid,
-unless `--insecure-links` restores the legacy plain `chdir()`.
-
-Each of these reads or writes a path the operator or sender chose, which
-may transit attacker-influenceable parent directories (the `/tmp/somedir/`
-class) or be planted directly (the `/home/$user/.cvsignore` class when
-root runs `rsync -a /home /backup`).
-
-rsync's defense, applied uniformly to all of the above, is a
-component-by-component path walk (`open_no_attacker_symlinks` in
-`util1.c`) that allows symlinks **only** when the symlink itself is owned
-by uid 0 or the running process's effective uid.  Symlinks owned by any
-other uid are refused with `ELOOP` at any path component (parent or leaf).
-Plain `O_NOFOLLOW` would be leaf-only and would not defend the
-`/tmp/somedir/log` parent-component plant; this walk does.
-
-The trust model preserves legitimate setups such as `/var/log -> /data/log`
-(root-owned dir-symlink) and a non-root user's own `~/log -> /data/me`
-symlink; it refuses an attacker's `/tmp/somedir -> /attack/path` plant.
-For `--read-batch` an additional `fstat()` check refuses non-regular
-files (FIFOs, devices) at the batch path, since the batch content drives
-the receiver's protocol parser.
-
-**Policy.** A symlink at **any** path component (parent or leaf) is **followed
-iff it is owned by uid 0 or the process's effective uid, and refused (`ELOOP`)
-otherwise**, identically for **absolute and relative** operator paths.  The trust
-signal is **authority (ownership)**, not **location**: an operator path may
-legitimately point outside the transfer tree, so it cannot be confined by
-location the way a transfer path is.  This is deliberately distinct from the
-transfer-path resolver `secure_relative_open()` (see *Symlink-race-safe path
-resolution* above), which refuses **all** symlinks and anchors **beneath the
-transfer root** — correct for peer-named paths, which never legitimately escape.
-For the operator directory paths, a refused symlink simply makes the target look
-absent (no backup/temp/basis is taken through it) and the transfer proceeds
-normally; the operator's own symlinked target keeps working.
-
-**The daemon `exclude`/`filter` chain is not a symlink boundary.** The daemon
-filter chain (`exclude`, `exclude from`, `filter`, …) matches the *logical*
-module-relative **name** of each item, not the physical file it resolves to.  It
-is a visibility/tamper filter — a peer cannot *name* a daemon-excluded path to
-pull, push to, or delete it — but it is **not** a security boundary against
-symlinks: an in-module symlink whose own name is not excluded can be followed to
-an excluded target (the name the filter sees, e.g. `link`, is not the excluded
-name, e.g. `secret`).  This is by design and is the long-standing behaviour of
-stock rsync; the defense for a writable module against symlink trickery is
-`munge symlinks` (enabled by default for a writable, non-chrooted module), **not**
-the filter.  Do not rely on `exclude`/`filter` to confine a peer who can introduce
-or traverse a symlink; see `rsyncd.conf(5)` ("filter" and "munge symlinks").
-
-What *is* enforced for a *peer-supplied* operator path (`--partial-dir`,
-`--backup-dir`, the alt-dest basis) is confinement to the **module root**: the
-ownership walk refuses a foreign-uid symlink (the symlink-race defense) and
-refuses a resolved target *outside* the module.  That module-boundary confinement
-is independent of `exclude`/`filter` — it holds whether or not the module sets an
-exclude — and is what the operator-path tests cover.
-
-**`--insecure-links`.** This flag is a **local** opt-out that restores the legacy
-follow-any-symlink behaviour for the paths above.  It is **not forwarded** to the
-remote (a remote-shell peer that wants the opt-out must set it on its own side,
-e.g. via `--rsync-path`), and a **daemon never honors it**: the opt-out predicate
-reads the client-controllable flag only off a daemon, so a peer-forwarded or
-`-M`-injected `--insecure-links` cannot weaken a daemon's confinement — the daemon
-additionally hard-refuses it (drops the connection) via the refused-options path.
-A daemon admin who wants the legacy behaviour for one isolated/trusted module
-sets `insecure links = yes` in that module's `rsyncd.conf` stanza (see
-`rsyncd.conf(5)`); this is admin-only and re-opens the symlink-escape
-vulnerabilities for that module on purpose.  The `operator-path-*` and
-`insecure-links-*` tests enforce this consistency across every path-taking
-option and across absolute/relative, leaf/parent, and same-uid/cross-uid plants.
-
-For `support/rrsync` (the SSH-restricted-rsync wrapper), the same TOCTOU
-class is closed in Python by opening each validated path component with
-`O_RDONLY|O_NOFOLLOW`, verifying via `readlink('/proc/self/fd/N')` that the
-pinned inode is still in-tree, and passing `/proc/self/fd/N` as the exec'd
-rsync's argument (so the kernel routes the child's open through the pinned
-inode rather than re-resolving the path).  A receiver-side new destination
-has no inode of its own yet, so its existing parent directory is pinned the
-same way and the leaf is created at `/proc/self/fd/<parent>/<leaf>`.  This pin
-relies on an fdescfs-style magic symlink and is not available on every
-platform -- see the rrsync residual below.
-
-### Known residuals
-
-The following are documented as out of scope for this release:
-
-* The source-directory *enumeration* confinement needs `fdopendir()` (to form a
-  `DIR*` from the securely-resolved held fd) and `dirfd()`; on a platform lacking
-  either, `send_directory()` falls back to the legacy `opendir()` on the path, so
-  the scan is unconfined there — the same resolver-fallback shape as the other
-  `*at()`-less residuals.  Every current target provides both; the per-entry
-  operations and the content open remain confined regardless.
-
-* On **Cygwin**, the per-component held-fd walk does not provide the same
-  inode-pinning guarantee as on a POSIX kernel: Cygwin tracks a process's
-  current directory and resolves directory descriptors by path name rather than
-  by a pinned inode, and emulates symlinks as special files.  Static out-of-tree
-  symlinks are still refused (the walk sees and rejects them), and a daemon
-  module path anchored at an absolute `module_dir` is confined; but an entry
-  whose parent component is *raced* from a directory to a symlink mid-resolution
-  can still slip past confinement that is anchored at the process CWD (e.g. the
-  sender's content open), because the descriptor is not bound to the original
-  inode.  The parent-component symlink-race tests are therefore not enforced on
-  Cygwin (see `RSYNC_EXPECT_SKIPPED` in `.github/workflows/cygwin-build.yml` and
-  the Cygwin-only xfail in `symlink-race-source_test.py`).  Cygwin is a
-  development/interoperability target, not a privilege boundary host, so this is
-  accepted for this release.
-
-* On a platform with no `mknodat()` at all -- macOS before 13 is the
-  supported example, where `mknod()` and `mkfifo()` exist but neither
-  `mknodat()` nor `mkfifoat()` does -- creating a device node or FIFO
-  falls back to plain `do_mknod()`, which resolves the whole path by name.
-  What is lost is the *pinned parent*: the directory components are
-  re-resolved by the kernel at create time, so an attacker who can swap a
-  parent component races the create and can place the node outside the
-  transfer.  The final component is not at risk -- `mknod()` and
-  `mkfifo()` do not follow a symlink at the leaf, they fail `EEXIST`.
-  Where `AT_FDCWD` exists -- which is every platform rsync 3.5.0 supports,
-  macOS 10.13 included -- fake-super placeholders still return through
-  `openat(..., O_NOFOLLOW)`, reached before either `*at` primitive is
-  tested, so ordinary in-tree placeholder creation stays confined;
-  fake-super loses parent confinement and the `O_NOFOLLOW` leaf only on the
-  paths that reach plain `do_mknod()` (the cache-declined/cross-tree
-  wrapper and the backup paths).  On a build with no `AT_FDCWD` at all
-  there is no fd-relative primitive of any kind, so nothing above applies
-  and every special-file create, fake-super included, is unconfined.  Transferring specials there (`--devices`, `--specials`) carries
-  the parent-component race.  `symlink-mknod-fakesuper-symlink-race` skips
-  itself on such a build, since the property it asserts is one the build
-  deliberately does not have.
-
-* On platforms where `mknod()`/`mknodat()` cannot create a socket inode
-  (the BSDs, macOS, Solaris), a transferred socket is recreated with
-  `socket()` + `unlink` + `bind(path)`, which cannot be confined (there is
-  no portable `bindat()`).  Linux creates it race-safely with `mknodat()`
-  on a held dirfd; on the others a *nested* socket is skipped with a
-  warning rather than bound on an unconfined path, leaving only a
-  top-level, operator-named socket binding by path.
-
-* `support/rrsync`'s race-free inode-pin -- of both existing path
-  components and a new destination's parent -- depends on materialising a
-  held fd as a path that the exec'd rsync re-resolves to the same inode.
-  rrsync validates and pins in its own process, but it then *exec*s a
-  separate rsync that re-resolves the paths from `argv`, so the confining
-  reference must be expressible as an argument.  A held dirfd is not: it is
-  usable as a path only through an fdescfs-style magic symlink.  rrsync
-  implements this for Linux only, via `/proc/self/fd/N`; it does not use the
-  `/dev/fd/N` equivalent that macOS/FreeBSD expose with `fdescfs` mounted.  So on
-  every non-Linux platform (the BSDs, macOS, Solaris -- whose `/proc/self/fd`
-  entries are not magic symlinks -- and Cygwin), and on a `/proc`-less Linux
-  namespace, rrsync falls through to the realpath-validated path unpinned,
-  so a parent-component or between-pin-and-exec flip remains possible there;
-  a deeper `-R` new path whose parent does not exist yet is likewise
-  unpinned.  The portable closure is an rsync-side fd-passing API -- rrsync
-  hands rsync the confined dirfd (inherited across `exec`) and rsync
-  resolves that argument relative to it with the same `secure_relative_open`
-  resolver the daemon uses, needing no magic-symlink filesystem -- a
-  protocol/CLI addition under discussion on the rsync-security list.
-
-* The operator-directory ownership walk refuses a foreign-owned symlink on a
-  `--backup-dir`/`--temp-dir`/`--partial-dir`/`--link/compare/copy-dest` path, so
-  a *statically planted* symlink is rejected and the dependent operation does not
-  escape.  Both the data writes and the *source-metadata reads* of those
-  operations are now confined to held no-follow fds: the `--copy-dest`
-  `copy_file()`/`copy_xattrs()` source read goes through the held basis content fd
-  (`sys_fgetxattr`), and `make_backup()` reads the backed-up file's ACL/xattrs
-  through a `backup_source_fd()`-pinned fd -- so a parent-component flip can no
-  longer redirect them to disclose an out-of-module value.  The cross-tree
-  metadata *apply* on those leaves (the `%stat`/ACL/xattr write on a
-  `--temp-dir`/`--backup-dir` staging file) is fd-pinned the same way, now
-  including under `--fake-super`: the `set_file_attrs()` no-follow leaf fd was
-  previously opened only when `am_root >= 0`, so a `fake super = yes` daemon fell
-  back to a path-based `sys_lsetxattr()`/chmod a raced parent could redirect; the
-  pin is now opened for fake-super too (a raced leaf is refused, not redirected).
-  Two narrow follow-ons
-  re-resolve the (now-validated) operator path by name and remain a
-  *post-validation* parent-component race:
-    * the in-place backup (`--inplace --backup`) writes the backup file's data
-      through a confined create, but its `set_file_attrs()` metadata set
-      (chmod/chown/times) re-resolves the `--backup-dir` path by name afterwards
-      (it is not placed under operator mode, which would force the shared
-      `set_file_attrs()` path off its held-O_NOFOLLOW-fd xattr write and re-open
-      the very parent-symlink xattr race `copy-xattrs-symlink-race` pins closed); and
-    * the abbreviated-xattr optimisation reuses a basis xattr value for the
-      destination only when its checksum matches the digest the sender sent; that
-      basis read (`rsync_xal_set()`) re-resolves the basis path by name.  This is a
-      *constrained checksum-oracle*, not a disclosure: it confirms that some raced
-      out-of-module xattr hashes to a value the sender already chose, rather than
-      copying an unknown value onto a readable file, and needs a colluding sender
-      plus a local racer.
-  An attacker who flips a parent component in the window *after* the confined data
-  write/stat can thus still affect those narrow metadata/oracle operations.  This
-  is the same local-attacker post-confinement TOCTOU class as the ACL/crtimes
-  residuals below; the data-write and direct source-read escapes are closed, and
-  `--insecure-links` (or a module's `insecure links = yes`) is orthogonal to it.
-
-* POSIX ACL application (`-A`/`--acls`) is race-safe on every Linux kernel —
-  6.13+ via the `*xattrat` syscalls (or a patched libacl's `*_at` bindings), and
-  older kernels via the `/proc/self/fd` compat that pins the same inode, provided
-  `procfs` is mounted — and a transferred file/dir/FIFO has its xattrs (`-X`)
-  applied through the held no-follow fd, so the apply cannot be redirected by a
-  raced parent component.  Where neither primitive is available — the BSDs,
-  Solaris and macOS (no `*xattrat` syscalls and no `/proc/self/fd` magic
-  symlinks), plus the edge case of a Linux instance with no usable `/proc` (a
-  `/proc`-less container/namespace) — the ACL apply falls back to the path-based
-  `acl_set_file()` /
-  `sys_acl_*file()` calls — the long-standing 3.4.x behaviour — to keep `--acls`
-  functional rather than silently skipping it, so a parent-component flip can
-  have the received ACL written onto an object outside the module/destination
-  boundary (and, because the attacker controls the ACL bytes, granted to a chosen
-  uid).  As with the macOS crtime tier below, this is an accepted residual under
-  the functionality-over-refusal policy; a daemon operator who does not want it
-  can disable the feature with `refuse options = acls`.
-
-* macOS creation-time (`--crtimes`) preservation uses the path-based
-  `setattrlist()`/`getattrlist()` with `FSOPT_NOFOLLOW`, which protects only
-  the final component; there is no `setattrlistat()` targeting
-  `ATTR_CMN_CRTIME`.  As with POSIX ACLs where the OS offers no race-safe
-  primitive, `--crtimes` is kept functional (daemon and non-daemon) and the
-  parent-component symlink race is an accepted residual: an attacker who
-  flips a parent component can have a crtime read/write target an object
-  outside the module/destination boundary.  The mtime/atime path is *not*
-  affected -- `set_times()` resolves it race-safely through `utimensat()` on a
-  held dirfd in hardened mode.  A daemon operator who does not want the crtime
-  residual can disable the feature with `refuse options = crtimes` in
-  `rsyncd.conf`.
-
-* Pulling with `-o`/`-g` (or `-a`) **as root from an untrusted sender** is by
-  design a trust relationship, not a confinement boundary: the sender dictates
-  each received file's owner/group, including uid/gid 0.  rsync maps the
-  sender's id/name pairs through the local id database; an empty or unknown
-  sender name falls back to the sender's numeric id (the value `--numeric-ids`
-  would use), and a sender can equally request root via the literal name
-  `root`.  A root receiver must therefore only pull with `-o`/`-g` from a
-  trusted source (or use a non-root receiver / a uid-gid policy).  The daemon
-  *name-converter* path is guarded separately — an unknown name there maps to
-  the sender's numeric id rather than 0 (see `clientserver.c`).
-
-## Daemon authentication digest
-
-Daemon authentication is a secret-prefix challenge-response: the client returns
-`base64(H(secret || challenge))`, where `H` is a digest the two sides negotiate.
-The negotiation is unauthenticated and ordered by the connecting side, and the
-`md5`/`md4` digests remain available for backward compatibility, so a peer that
-sends no digest list (any rsync before 3.2.0, including the openrsync that ships
-with macOS) falls back to `md5` (or `md4` below protocol 30), and an on-path
-attacker can rewrite the negotiation to force `md5`/`md4` even between two modern
-peers.  This is **not** an authentication bypass — `md4`/`md5` have no practical
-preimage break — but a weak digest makes a *captured* `(challenge, response)`
-pair far cheaper to brute-force offline, recovering a guessable shared secret.
-
-The challenge itself is seeded from the kernel CSPRNG (`/dev/urandom`), so it is
-an unpredictable per-connection nonce. An earlier time/pid-based challenge was
-low-entropy enough (~35 bits) that recovering the `(sec, usec, pid)` tuple from
-one observed challenge let an on-path observer predict every subsequent challenge
-from that daemon process and pre-compute a dictionary against a captured
-response. (If `/dev/urandom` is unavailable the daemon logs a warning and falls
-back to the legacy time-based challenge rather than a constant.)
-
-A daemon operator whose clients are all modern (rsync 3.2.7+ built with openssl,
-when the SHA digests were added) can require a strong digest with the `auth
-digest` module parameter, e.g. `auth digest = sha256`, which refuses any
-connection that negotiates — or falls back to — a weaker digest (see
-`rsyncd.conf`).
-
-Residual: there is **no default floor**, because requiring one would break every
-pre-3.2.0 client (notably the macOS-bundled openrsync, which authenticates only
-with `md4`).  An operator who cannot raise the floor should run the daemon behind
-a verified TLS transport (`rsync-ssl`/stunnel) or over ssh — which removes the
-on-path capture/downgrade vector at the transport layer — and should use a
-high-entropy shared secret, which is infeasible to brute-force regardless of the
-digest.
@@ -15,6 +15,7 @@ Create more granular verbosity					2003/05/15

 DOCUMENTATION --------------------------------------------------------
 Keep list of open issues and todos on the web site
+Perhaps redo manual as SGML

 LOGGING --------------------------------------------------------------
 Memory accounting
@@ -48,7 +49,7 @@ Create test makefile target for some tests

 RELATED PROJECTS -----------------------------------------------------
 rsyncsh
-https://rsync.samba.org/rsync-and-debian/
+http://rsync.samba.org/rsync-and-debian/
 rsyncable gzip patch
 rsyncsplit as alternative to real integration with gzip?
 reverse rsync over HTTP Range
@@ -65,8 +66,8 @@ Use chroot only if supported
  If running as non-root, then don't fail, just give a warning.
  (There was a thread about this a while ago?)

-    https://lists.samba.org/pipermail/rsync/2001-August/thread.html
-    https://lists.samba.org/pipermail/rsync/2001-September/thread.html
+    http://lists.samba.org/pipermail/rsync/2001-August/thread.html
+    http://lists.samba.org/pipermail/rsync/2001-September/thread.html

                      --          --

@@ -93,7 +94,7 @@ Handling IPv6 on old machines
  platforms that have a half-working implementation, so redefining
  these functions clashes with system headers, and leaving them out
  breaks.  This affects at least OSF/1, RedHat 5, and Cobalt, which
-  are moderately important.
+  are moderately improtant.

  Perhaps the simplest solution would be to have two different files
  implementing the same interface, and choose either the new or the
@@ -203,7 +204,7 @@ Create more granular verbosity					2003/05/15
  fine grained selection of statistical reporting and what
  actions are logged.

-  https://lists.samba.org/archive/rsync/2003-May/006059.html
+  http://lists.samba.org/archive/rsync/2003-May/006059.html

                      --          --

@@ -212,6 +213,16 @@ DOCUMENTATION --------------------------------------------------------

 Keep list of open issues and todos on the web site

+                      --          --
+
+
+Perhaps redo manual as SGML
+
+  The man page is getting rather large, and there is more information
+  that ought to be added.
+
+  TexInfo source is probably a dying format.
+
  Linuxdoc looks like the most likely contender.  I know DocBook is
  favoured by some people, but it's so bloody verbose, even with emacs
  support.
@@ -225,7 +236,7 @@ Memory accounting

  At exit, show how much memory was used for the file list, etc.

-  We also do a weird exponential-growth allocation in flist.c.  I'm
+  Also we do a wierd exponential-growth allocation in flist.c.  I'm
  not sure this makes sense with modern mallocs.  At any rate it will
  make us allocate a huge amount of memory for large file lists.

@@ -276,7 +287,7 @@ Perhaps flush stdout like syslog

  Perhaps flush stdout after each filename, so that people trying to
  monitor progress in a log file can do so more easily.  See
-  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=48108
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=48108

                      --          --

@@ -484,7 +495,7 @@ rsyncsh
                      --          --


-https://rsync.samba.org/rsync-and-debian/
+http://rsync.samba.org/rsync-and-debian/


                      --          --
@@ -2,7 +2,7 @@
 * Routines to authenticate access to a daemon (hosts allow/deny).
 *
 * Copyright (C) 1998 Andrew Tridgell
- * Copyright (C) 2004-2022 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,64 +19,15 @@
 */

 #include "rsync.h"
-#include "ifuncs.h"
-#ifdef HAVE_NETGROUP_H
-#include <netgroup.h>
-#endif

-static int allow_forward_dns;
-
-extern const char undetermined_hostname[];
-
-static int match_hostname(const char **host_ptr, const char *addr, const char *tok, int deny)
+static int match_hostname(char *host, char *tok)
 {
-	struct hostent *hp;
-	unsigned int i;
-	const char *host = *host_ptr;
-
 	if (!host || !*host)
 		return 0;
-
-#ifdef HAVE_INNETGR
-	if (*tok == '@' && tok[1])
-		return innetgr(tok + 1, host, NULL, NULL);
-#endif
-
-	/* First check if the reverse-DNS-determined hostname matches. */
-	if (iwildmatch(tok, host))
-		return 1;
-
-	if (!allow_forward_dns)
-		return 0;
-
-	/* Fail quietly if tok is an address or wildcarded entry, not a simple hostname. */
-	if (!tok[strspn(tok, ".0123456789")] || tok[strcspn(tok, ":/*?[")])
-		return 0;
-
-	/* Now try forward-DNS on the token (config-specified hostname) and see if the IP matches. */
-	if (!(hp = gethostbyname(tok))) {
-		/* A deny-list hostname token we cannot resolve must fail CLOSED:
-		 * we can't prove the peer isn't the denied host, so treat the
-		 * unresolvable token as a match (deny).  Allow-list tokens keep
-		 * failing as a non-match.  Sibling of CVE-2026-43617, which fixed
-		 * only the reverse-lookup path. */
-		return deny;
-	}
-
-	for (i = 0; hp->h_addr_list[i] != NULL; i++) {
-		if (strcmp(addr, inet_ntoa(*(struct in_addr*)(hp->h_addr_list[i]))) == 0) {
-			/* If reverse lookups are off, we'll use the conf-specified
-			 * hostname in preference to UNDETERMINED. */
-			if (host == undetermined_hostname)
-				*host_ptr = strdup(tok);
-			return 1;
-		}
-	}
-
-	return 0;
+	return wildmatch(tok, host);
 }

-static int match_binary(const char *b1, const char *b2, const char *mask, int addrlen)
+static int match_binary(char *b1, char *b2, char *mask, int addrlen)
 {
 	int i;

@@ -105,7 +56,7 @@ static void make_mask(char *mask, int plen, int addrlen)
 	return;
 }

-static int match_address(const char *addr, char *tok)
+static int match_address(char *addr, char *tok)
 {
 	char *p;
 	struct addrinfo hints, *resa, *rest;
@@ -119,16 +70,24 @@ static int match_address(const char *addr, char *tok)
 #endif
 	char mask[16];
 	char *a = NULL, *t = NULL;
+	unsigned int len;

 	if (!addr || !*addr)
 		return 0;

 	p = strchr(tok,'/');
-	if (p)
+	if (p) {
 		*p = '\0';
+		len = p - tok;
+	} else
+		len = strlen(tok);

-	/* Fail quietly if tok is a hostname, not an address. */
-	if (tok[strspn(tok, ".0123456789")] && strchr(tok, ':') == NULL) {
+	/* Fail quietly if tok is a hostname (not an address) */
+	if (strspn(tok, ".0123456789") != len
+#ifdef INET6
+	    && strchr(tok, ':') == NULL
+#endif
+	) {
 		if (p)
 			*p = '/';
 		return 0;
@@ -171,7 +130,8 @@ static int match_address(const char *addr, char *tok)
 		break;

 #ifdef INET6
-	case PF_INET6: {
+	case PF_INET6:
+	    {
 		struct sockaddr_in6 *sin6a, *sin6t;

 		sin6a = (struct sockaddr_in6 *)resa->ai_addr;
@@ -183,19 +143,20 @@ static int match_address(const char *addr, char *tok)
 		addrlen = 16;

 #ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
-		if (sin6t->sin6_scope_id && sin6a->sin6_scope_id != sin6t->sin6_scope_id) {
+		if (sin6t->sin6_scope_id &&
+		    sin6a->sin6_scope_id != sin6t->sin6_scope_id) {
 			ret = 0;
 			goto out;
 		}
 #endif

 		break;
-	}
+	    }
 #endif
 	default:
-		rprintf(FLOG, "unknown family %u\n", rest->ai_family);
-		ret = 0;
-		goto out;
+	    rprintf(FLOG, "unknown family %u\n", rest->ai_family);
+	    ret = 0;
+	    goto out;
 	}

 	bits = -1;
@@ -249,15 +210,20 @@ static int match_address(const char *addr, char *tok)
 	return ret;
 }

-static int access_match(const char *list, const char *addr, const char **host_ptr, int deny)
+static int access_match(char *list, char *addr, char *host)
 {
 	char *tok;
 	char *list2 = strdup(list);

+	if (!list2)
+		out_of_memory("access_match");
+
 	strlower(list2);
+	if (host)
+		strlower(host);

 	for (tok = strtok(list2, " ,\t"); tok; tok = strtok(NULL, " ,\t")) {
-		if (match_hostname(host_ptr, addr, tok, deny) || match_address(addr, tok)) {
+		if (match_hostname(host, tok) || match_address(addr, tok)) {
 			free(list2);
 			return 1;
 		}
@@ -267,21 +233,16 @@ static int access_match(const char *list, const char *addr, const char **host_pt
 	return 0;
 }

-int allow_access(const char *addr, const char **host_ptr, int i)
+int allow_access(char *addr, char *host, char *allow_list, char *deny_list)
 {
-	const char *allow_list = lp_hosts_allow(i);
-	const char *deny_list = lp_hosts_deny(i);
-
 	if (allow_list && !*allow_list)
 		allow_list = NULL;
 	if (deny_list && !*deny_list)
 		deny_list = NULL;

-	allow_forward_dns = lp_forward_lookup(i);
-
 	/* If we match an allow-list item, we always allow access. */
 	if (allow_list) {
-		if (access_match(allow_list, addr, host_ptr, 0))
+		if (access_match(allow_list, addr, host))
 			return 1;
 		/* For an allow-list w/o a deny-list, disallow non-matches. */
 		if (!deny_list)
@@ -290,17 +251,9 @@ int allow_access(const char *addr, const char **host_ptr, int i)

 	/* If we match a deny-list item (and got past any allow-list
 	 * items), we always disallow access. */
-	if (deny_list && access_match(deny_list, addr, host_ptr, 1))
+	if (deny_list && access_match(deny_list, addr, host))
 		return 0;

 	/* Allow all other access. */
 	return 1;
 }
-
-int allow_proxy_protocol_peer(const char *list, const char *addr, const char **host_ptr)
-{
-	if (!list || !*list)
-		return 0;
-	allow_forward_dns = 0;
-	return access_match(list, addr, host_ptr, 0);
-}
@@ -0,0 +1,92 @@
+dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)]
+dnl if the cache file is inconsistent with the current host,
+dnl target and build system types, execute CMD or print a default
+dnl error message.
+AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [
+    AC_REQUIRE([AC_CANONICAL_SYSTEM])
+    AC_MSG_CHECKING([config.cache system type])
+    if { test x"${ac_cv_host_system_type+set}" = x"set" &&
+         test x"$ac_cv_host_system_type" != x"$host"; } ||
+       { test x"${ac_cv_build_system_type+set}" = x"set" &&
+         test x"$ac_cv_build_system_type" != x"$build"; } ||
+       { test x"${ac_cv_target_system_type+set}" = x"set" &&
+         test x"$ac_cv_target_system_type" != x"$target"; }; then
+	AC_MSG_RESULT([different])
+	ifelse($#, 1, [$1],
+		[AC_MSG_ERROR(["you must remove config.cache and restart configure"])])
+    else
+	AC_MSG_RESULT([same])
+    fi
+    ac_cv_host_system_type="$host"
+    ac_cv_build_system_type="$build"
+    ac_cv_target_system_type="$target"
+])
+
+dnl Check for socklen_t: historically on BSD it is an int, and in
+dnl POSIX 1g it is a type of its own, but some platforms use different
+dnl types for the argument to getsockopt, getpeername, etc.  So we
+dnl have to test to find something that will work.
+
+dnl This is no good, because passing the wrong pointer on C compilers is
+dnl likely to only generate a warning, not an error.  We don't call this at
+dnl the moment.
+
+AC_DEFUN([TYPE_SOCKLEN_T],
+[
+   AC_CHECK_TYPE([socklen_t], ,[
+      AC_MSG_CHECKING([for socklen_t equivalent])
+      AC_CACHE_VAL([rsync_cv_socklen_t_equiv],
+      [
+         # Systems have either "struct sockaddr *" or
+         # "void *" as the second argument to getpeername
+         rsync_cv_socklen_t_equiv=
+         for arg2 in "struct sockaddr" void; do
+            for t in int size_t unsigned long "unsigned long"; do
+               AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+                  int getpeername (int, $arg2 *, $t *);
+               ],[
+                  $t len;
+                  getpeername(0,0,&len);
+               ],[
+                  rsync_cv_socklen_t_equiv="$t"
+                  break
+               ])
+            done
+         done
+
+         if test "x$rsync_cv_socklen_t_equiv" = x; then
+            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+         fi
+      ])
+      AC_MSG_RESULT($rsync_cv_socklen_t_equiv)
+      AC_DEFINE_UNQUOTED(socklen_t, $rsync_cv_socklen_t_equiv,
+			[type to use in place of socklen_t if not defined])],
+      [#include <sys/types.h>
+#include <sys/socket.h>])
+])
+
+dnl AC_HAVE_TYPE(TYPE,INCLUDES)
+AC_DEFUN([AC_HAVE_TYPE], [
+AC_REQUIRE([AC_HEADER_STDC])
+cv=`echo "$1" | sed 'y%./+- %__p__%'`
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL([ac_cv_type_$cv],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_INCLUDES_DEFAULT
+$2]],
+[[$1 foo;]])],
+[eval "ac_cv_type_$cv=yes"],
+[eval "ac_cv_type_$cv=no"]))dnl
+ac_foo=`eval echo \\$ac_cv_type_$cv`
+AC_MSG_RESULT($ac_foo)
+if test "$ac_foo" = yes; then
+  ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+if false; then
+	AC_CHECK_TYPES($1)
+fi
+  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
+fi
+])
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 1996 Andrew Tridgell
 * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2006-2022 Wayne Davison
+ * Copyright (C) 2006-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,10 +21,6 @@

 #include "rsync.h"
 #include "lib/sysacls.h"
-#include "lib/acl.h"
-#ifdef HAVE_LIBACL_AT
-#include <fcntl.h>	/* AT_EMPTY_PATH / AT_SYMLINK_NOFOLLOW */
-#endif

 #ifdef SUPPORT_ACLS

@@ -32,11 +28,9 @@ extern int dry_run;
 extern int am_root;
 extern int read_only;
 extern int list_only;
-extern mode_t orig_umask;
+extern int orig_umask;
 extern int numeric_ids;
 extern int inc_recurse;
-extern int preserve_devices;
-extern int preserve_specials;

 /* Flags used to indicate what items are being transmitted for an entry. */
 #define XMIT_USER_OBJ (1<<0)
@@ -52,7 +46,7 @@ extern int preserve_specials;
 /* When we send the access bits over the wire, we shift them 2 bits to the
 * left and use the lower 2 bits as flags (relevant only to a name entry).
 * This makes the protocol more efficient than sending a value that would
- * be likely to have its highest bits set. */
+ * be likely to have its hightest bits set. */
 #define XFLAG_NAME_FOLLOWS 0x0001u
 #define XFLAG_NAME_IS_USER 0x0002u

@@ -94,9 +88,6 @@ static const rsync_acl empty_rsync_acl = {
 static item_list access_acl_list = EMPTY_ITEM_LIST;
 static item_list default_acl_list = EMPTY_ITEM_LIST;

-static size_t prior_access_count = (size_t)-1;
-static size_t prior_default_count = (size_t)-1;
-
 /* === Calculations on ACL types === */

 static const char *str_acl_type(SMB_ACL_TYPE_T type)
@@ -121,11 +112,10 @@ static int calc_sacl_entries(const rsync_acl *racl)
 	/* A System ACL always gets user/group/other permission entries. */
 	return racl->names.count
 #ifdef ACLS_NEED_MASK
-	     + 1
+	     + 4;
 #else
-	     + (racl->mask_obj != NO_ENTRY)
+	     + (racl->mask_obj != NO_ENTRY) + 3;
 #endif
-	     + 3;
 }

 /* Extracts and returns the permission bits from the ACL.  This cannot be
@@ -139,21 +129,15 @@ static int rsync_acl_get_perms(const rsync_acl *racl)

 /* Removes the permission-bit entries from the ACL because these
 * can be reconstructed from the file's mode. */
-static void rsync_acl_strip_perms(stat_x *sxp)
+static void rsync_acl_strip_perms(rsync_acl *racl)
 {
-	rsync_acl *racl = sxp->acc_acl;
-
 	racl->user_obj = NO_ENTRY;
 	if (racl->mask_obj == NO_ENTRY)
 		racl->group_obj = NO_ENTRY;
 	else {
-		int group_perms = (sxp->st.st_mode >> 3) & 7;
-		if (racl->group_obj == group_perms)
+		if (racl->group_obj == racl->mask_obj)
 			racl->group_obj = NO_ENTRY;
-#ifndef HAVE_SOLARIS_ACLS
-		if (racl->names.count != 0 && racl->mask_obj == group_perms)
-			racl->mask_obj = NO_ENTRY;
-#endif
+		racl->mask_obj = NO_ENTRY;
 	}
 	racl->other_obj = NO_ENTRY;
 }
@@ -172,6 +156,8 @@ static rsync_acl *create_racl(void)
 {
 	rsync_acl *racl = new(rsync_acl);

+	if (!racl)
+		out_of_memory("create_racl");
 	*racl = empty_rsync_acl;

 	return racl;
@@ -334,11 +320,14 @@ static BOOL unpack_smb_acl(SMB_ACL_T sacl, rsync_acl *racl)
 	if (temp_ida_list.count) {
 #ifdef SMB_ACL_NEED_SORT
 		if (temp_ida_list.count > 1) {
-			qsort(temp_ida_list.items, temp_ida_list.count, sizeof (id_access), id_access_sorter);
+			qsort(temp_ida_list.items, temp_ida_list.count,
+			      sizeof (id_access), id_access_sorter);
 		}
 #endif
-		racl->names.idas = new_array(id_access, temp_ida_list.count);
-		memcpy(racl->names.idas, temp_ida_list.items, temp_ida_list.count * sizeof (id_access));
+		if (!(racl->names.idas = new_array(id_access, temp_ida_list.count)))
+			out_of_memory("unpack_smb_acl");
+		memcpy(racl->names.idas, temp_ida_list.items,
+		       temp_ida_list.count * sizeof (id_access));
 	} else
 		racl->names.idas = NULL;

@@ -347,6 +336,15 @@ static BOOL unpack_smb_acl(SMB_ACL_T sacl, rsync_acl *racl)
 	/* Truncate the temporary list now that its idas have been saved. */
 	temp_ida_list.count = 0;

+#ifdef ACLS_NEED_MASK
+	if (!racl->names.count && racl->mask_obj != NO_ENTRY) {
+		/* Throw away a superfluous mask, but mask off the
+		 * group perms with it first. */
+		racl->group_obj &= racl->mask_obj;
+		racl->mask_obj = NO_ENTRY;
+	}
+#endif
+
 	return True;
 }

@@ -422,7 +420,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
 #ifdef ACLS_NEED_MASK
 	mask_bits = racl->mask_obj == NO_ENTRY ? racl->group_obj & ~NO_ENTRY : racl->mask_obj;
 	COE( sys_acl_create_entry,(smb_acl, &entry) );
-	COE( sys_acl_set_info,(entry, SMB_ACL_MASK, mask_bits, 0) );
+	COE( sys_acl_set_info,(entry, SMB_ACL_MASK, mask_bits, NULL) );
 #else
 	if (racl->mask_obj != NO_ENTRY) {
 		COE( sys_acl_create_entry,(smb_acl, &entry) );
@@ -473,129 +471,11 @@ static int find_matching_rsync_acl(const rsync_acl *racl, SMB_ACL_TYPE_T type,
 	return *match;
 }

-/* These two bridge lib/acl.c's neutral (tag,perm,id) entry array; with
- * HAVE_LIBACL_AT the libacl *_at path uses unpack_smb_acl/pack_smb_acl directly,
- * so they are unused there. */
-#if defined(SUPPORT_ACL_FD) && !defined(HAVE_LIBACL_AT)
-/* Convert a packed system ACL into the neutral (tag,perm,id) entry array that
- * lib/acl.c serializes.  Reuses pack_smb_acl()+change_sacl_perms() output so
- * the bytes we write match exactly what acl_set_file() would have written.
- * Returns the entry count and a malloc'd array in *ents_p, or -1 on error. */
-static int sacl_to_entries(SMB_ACL_T sacl, rsync_acl_ent **ents_p)
-{
-	static item_list ent_list = EMPTY_ITEM_LIST;
-	SMB_ACL_ENTRY_T entry;
-	rsync_acl_ent *out;
-	int rc;
-
-	ent_list.count = 0;
-	for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry); rc == 1;
-	     rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
-		SMB_ACL_TAG_T tag_type;
-		uint32 access;
-		id_t g_u_id;
-		rsync_acl_ent *e;
-		uint16_t tag;
-
-		if ((rc = sys_acl_get_info(entry, &tag_type, &access, &g_u_id)) != 0)
-			break;
-		switch (tag_type) {
-		case SMB_ACL_USER_OBJ: tag = RACL_USER_OBJ; break;
-		case SMB_ACL_USER: tag = RACL_USER; break;
-		case SMB_ACL_GROUP_OBJ: tag = RACL_GROUP_OBJ; break;
-		case SMB_ACL_GROUP: tag = RACL_GROUP; break;
-		case SMB_ACL_MASK: tag = RACL_MASK; break;
-		case SMB_ACL_OTHER: tag = RACL_OTHER; break;
-		default: continue; /* skip an unrecognized tag */
-		}
-		e = EXPAND_ITEM_LIST(&ent_list, rsync_acl_ent, -10);
-		e->tag = tag;
-		e->perm = access & 7;
-		e->id = (tag == RACL_USER || tag == RACL_GROUP) ? (uint32_t)g_u_id : RACL_UNDEFINED_ID;
-	}
-	if (rc) {
-		rsyserr(FERROR_XFER, errno, "sacl_to_entries: sys_acl_get_entry/info()");
-		return -1;
-	}
-
-	out = new_array(rsync_acl_ent, ent_list.count ? ent_list.count : 1);
-	if (ent_list.count)
-		memcpy(out, ent_list.items, ent_list.count * sizeof (rsync_acl_ent));
-	*ents_p = out;
-	return ent_list.count;
-}
-
-/* Unpack a neutral entry array (from lib/acl.c) into an rsync_acl, mirroring
- * unpack_smb_acl()'s tag handling. */
-static BOOL unpack_acl_entries(const rsync_acl_ent *ents, int n, rsync_acl *racl)
-{
-	static item_list temp_ida_list = EMPTY_ITEM_LIST;
-	int i;
-
-	temp_ida_list.count = 0;
-	for (i = 0; i < n; i++) {
-		uint32 access = ents[i].perm & 7;
-		id_access *ida;
-
-		switch (ents[i].tag) {
-		case RACL_USER_OBJ:
-			if (racl->user_obj == NO_ENTRY)
-				racl->user_obj = access;
-			continue;
-		case RACL_GROUP_OBJ:
-			if (racl->group_obj == NO_ENTRY)
-				racl->group_obj = access;
-			continue;
-		case RACL_MASK:
-			if (racl->mask_obj == NO_ENTRY)
-				racl->mask_obj = access;
-			continue;
-		case RACL_OTHER:
-			if (racl->other_obj == NO_ENTRY)
-				racl->other_obj = access;
-			continue;
-		case RACL_USER:
-			access |= NAME_IS_USER;
-			break;
-		case RACL_GROUP:
-			break;
-		default:
-			continue;
-		}
-		ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
-		ida->id = ents[i].id;
-		ida->access = access;
-	}
-
-	if (temp_ida_list.count) {
-#ifdef SMB_ACL_NEED_SORT
-		if (temp_ida_list.count > 1)
-			qsort(temp_ida_list.items, temp_ida_list.count, sizeof (id_access), id_access_sorter);
-#endif
-		racl->names.idas = new_array(id_access, temp_ida_list.count);
-		memcpy(racl->names.idas, temp_ida_list.items, temp_ida_list.count * sizeof (id_access));
-	} else
-		racl->names.idas = NULL;
-	racl->names.count = temp_ida_list.count;
-	temp_ida_list.count = 0;
-
-	return True;
-}
-#endif /* SUPPORT_ACL_FD */
-
-static int get_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
-			 rsync_acl *racl, SMB_ACL_TYPE_T type, mode_t mode)
+static int get_rsync_acl(const char *fname, rsync_acl *racl,
+			 SMB_ACL_TYPE_T type, mode_t mode)
 {
 	SMB_ACL_T sacl;

-#ifndef SUPPORT_ACL_FD
-#ifndef HAVE_SOLARIS_ACLS
-	(void)fd; /* Solaris drives the ACL via facl(2) on fd but has no SUPPORT_ACL_FD. */
-#endif
-	(void)dirfd;
-	(void)leaf;
-#endif
-
 #ifdef SUPPORT_XATTRS
 	/* --fake-super support: load ACLs from an xattr. */
 	if (am_root < 0) {
@@ -603,7 +483,7 @@ static int get_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
 		size_t len;
 		int cnt;

-		if ((buf = get_xattr_acl(fname, fd, type == SMB_ACL_TYPE_ACCESS, &len)) == NULL)
+		if ((buf = get_xattr_acl(fname, type == SMB_ACL_TYPE_ACCESS, &len)) == NULL)
 			return 0;
 		cnt = (len - 4*4) / (4+4);
 		if (len < 4*4 || len != (size_t)cnt*(4+4) + 4*4) {
@@ -612,19 +492,15 @@ static int get_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
 		}

 		racl->user_obj = IVAL(buf, 0);
-		if (racl->user_obj == NO_ENTRY)
-			racl->user_obj = (mode >> 6) & 7;
 		racl->group_obj = IVAL(buf, 4);
-		if (racl->group_obj == NO_ENTRY)
-			racl->group_obj = (mode >> 3) & 7;
 		racl->mask_obj = IVAL(buf, 8);
 		racl->other_obj = IVAL(buf, 12);
-		if (racl->other_obj == NO_ENTRY)
-			racl->other_obj = mode & 7;

 		if (cnt) {
 			char *bp = buf + 4*4;
-			id_access *ida = racl->names.idas = new_array(id_access, cnt);
+			id_access *ida;
+			if (!(ida = racl->names.idas = new_array(id_access, cnt)))
+				out_of_memory("get_rsync_acl");
 			racl->names.count = cnt;
 			for ( ; cnt--; ida++, bp += 4+4) {
 				ida->id = IVAL(bp, 0);
@@ -636,113 +512,11 @@ static int get_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
 	}
 #endif

-#ifdef HAVE_SOLARIS_ACLS
-	/* Solaris has no libacl *_at; read the ACL through the held fd via facl(2)
-	 * when we have one.  With no held fd this branch is skipped and the path-based
-	 * call below reads the ACL (acceptable: a read can't redirect a write out of
-	 * the tree). */
-	if (fd >= 0) {
-		if ((sacl = sys_acl_get_fd_type(fd, type)) != 0) {
-			BOOL ok = unpack_smb_acl(sacl, racl);
-
-			sys_acl_free_acl(sacl);
-			if (!ok) {
-				rsyserr(FERROR_XFER, errno, "get_acl: unpack_smb_acl(%s)", fname);
-				return -1;
-			}
-			return 0;
-		}
-		if (no_acl_syscall_error(errno)) {
-			if (type == SMB_ACL_TYPE_ACCESS)
-				rsync_acl_fake_perms(racl, mode);
-			return 0;
-		}
-		rsyserr(FERROR_XFER, errno, "get_acl: sys_acl_get_fd_type(%s, %s)",
-			fname, str_acl_type(type));
-		return -1;
-	}
-#endif
-
-#ifdef SUPPORT_ACL_FD
-#ifdef HAVE_LIBACL_AT
-	/* Read the ACL via the new libacl *_at calls; fd<0 && dirfd<0
-	 * (e.g. a synthetic dir) falls through to the path-based call below. */
-	if (fd >= 0 || dirfd >= 0) {
-		if (fd >= 0)
-			sacl = sys_acl_get_file_at(fd, "", AT_EMPTY_PATH, type);
-		else
-			sacl = sys_acl_get_file_at(dirfd, leaf, AT_SYMLINK_NOFOLLOW, type);
-		if (sacl != 0) {
-			BOOL ok = unpack_smb_acl(sacl, racl);
-			sys_acl_free_acl(sacl);
-			if (!ok) {
-				rsyserr(FERROR_XFER, errno, "get_acl: unpack_smb_acl(%s)", fname);
-				return -1;
-			}
-			return 0;
-		}
-		if (no_acl_syscall_error(errno)) {
-			if (type == SMB_ACL_TYPE_ACCESS)
-				rsync_acl_fake_perms(racl, mode);
-			return 0;
-		}
-		rsyserr(FERROR_XFER, errno, "get_acl: acl_get_file_at(%s, %s)",
-			fname, str_acl_type(type));
-		return -1;
-	}
-#else
-	/* Race-safe path: read the ACL through the held O_NOFOLLOW fd, or via
-	 * setxattrat(AT_SYMLINK_NOFOLLOW) on dirfd+leaf, instead of re-resolving
-	 * fname.  Only for real-root ACLs (am_root >= 0; the fake-super branch
-	 * above already returned). */
-	if (fd >= 0 || (dirfd >= 0 && xacl_at_available())) {
-		int is_def = type == SMB_ACL_TYPE_DEFAULT;
-		rsync_acl_ent *ents = NULL;
-		int n = 0, rc;
-
-		if (fd >= 0)
-			rc = xacl_get_fd(fd, is_def, &ents, &n);
-		else
-			rc = xacl_get_at(dirfd, leaf, is_def, &ents, &n);
-		if (rc < 0) {
-			if (no_acl_syscall_error(errno)) {
-				if (type == SMB_ACL_TYPE_ACCESS)
-					rsync_acl_fake_perms(racl, mode);
-				return 0;
-			}
-			rsyserr(FERROR_XFER, errno, "get_acl: xacl_get(%s, %s)",
-				fname, str_acl_type(type));
-			return -1;
-		}
-		if (n == 0) {
-			/* No explicit ACL: mirror libacl's mode-derived access ACL
-			 * (an absent default ACL stays empty). */
-			if (type == SMB_ACL_TYPE_ACCESS)
-				rsync_acl_fake_perms(racl, mode);
-		} else if (!unpack_acl_entries(ents, n, racl)) {
-			if (ents)
-				free(ents);
-			rsyserr(FERROR_XFER, errno, "get_acl: unpack_acl_entries(%s)", fname);
-			return -1;
-		}
-		if (ents)
-			free(ents);
-		return 0;
-	}
-	/* Neither a held fd nor a usable dirfd path (xacl_at_available() covers the
-	 * *xattrat syscalls AND the pre-6.13 /proc/self/fd compat, so this is the
-	 * BSDs / a /proc-less namespace / an un-pinnable entry): read the real
-	 * destination ACL via the path-based call rather than a mode-only fake, so
-	 * --acls stays functional where the race-safe primitive is unavailable. */
-#endif /* HAVE_LIBACL_AT */
-#endif
-
 	if ((sacl = sys_acl_get_file(fname, type)) != 0) {
 		BOOL ok = unpack_smb_acl(sacl, racl);

 		sys_acl_free_acl(sacl);
 		if (!ok) {
-			rsyserr(FERROR_XFER, errno, "get_acl: unpack_smb_acl(%s)", fname);
 			return -1;
 		}
 	} else if (no_acl_syscall_error(errno)) {
@@ -758,31 +532,11 @@ static int get_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
 	return 0;
 }

-/* Return the Access Control List for the given filename.  When a held
- * O_NOFOLLOW fd (or a dirfd+leaf) is available, the ACL is read race-safely
- * through it; otherwise (fd < 0 && dirfd < 0) the path-based fallback is used. */
-int get_acl_fdat(int fd, int dirfd, const char *leaf, const char *fname, stat_x *sxp)
+/* Return the Access Control List for the given filename. */
+int get_acl(const char *fname, stat_x *sxp)
 {
 	sxp->acc_acl = create_racl();
-
-	if (S_ISREG(sxp->st.st_mode) || S_ISDIR(sxp->st.st_mode)) {
-		/* Everyone supports this. */
-	} else if (S_ISLNK(sxp->st.st_mode)) {
-		return 0;
-	} else if (IS_SPECIAL(sxp->st.st_mode)) {
-#ifndef NO_SPECIAL_ACLS
-		if (!preserve_specials)
-#endif
-			return 0;
-	} else if (IS_DEVICE(sxp->st.st_mode)) {
-#ifndef NO_DEVICE_ACLS
-		if (!preserve_devices)
-#endif
-			return 0;
-	} else if (IS_MISSING_FILE(sxp->st))
-		return 0;
-
-	if (get_rsync_acl(fd, dirfd, leaf, fname, sxp->acc_acl, SMB_ACL_TYPE_ACCESS,
+	if (get_rsync_acl(fname, sxp->acc_acl, SMB_ACL_TYPE_ACCESS,
 			  sxp->st.st_mode) < 0) {
 		free_acl(sxp);
 		return -1;
@@ -790,7 +544,7 @@ int get_acl_fdat(int fd, int dirfd, const char *leaf, const char *fname, stat_x

 	if (S_ISDIR(sxp->st.st_mode)) {
 		sxp->def_acl = create_racl();
-		if (get_rsync_acl(fd, dirfd, leaf, fname, sxp->def_acl, SMB_ACL_TYPE_DEFAULT,
+		if (get_rsync_acl(fname, sxp->def_acl, SMB_ACL_TYPE_DEFAULT,
 				  sxp->st.st_mode) < 0) {
 			free_acl(sxp);
 			return -1;
@@ -800,15 +554,10 @@ int get_acl_fdat(int fd, int dirfd, const char *leaf, const char *fname, stat_x
 	return 0;
 }

-int get_acl(const char *fname, stat_x *sxp)
-{
-	return get_acl_fdat(-1, -1, NULL, fname, sxp);
-}
-
 /* === Send functions === */

 /* Send the ida list over the file descriptor. */
-static void send_ida_entries(int f, const ida_entries *idal)
+static void send_ida_entries(const ida_entries *idal, int f)
 {
 	id_access *ida;
 	size_t count = idal->count;
@@ -820,9 +569,9 @@ static void send_ida_entries(int f, const ida_entries *idal)
 		const char *name;
 		if (ida->access & NAME_IS_USER) {
 			xbits |= XFLAG_NAME_IS_USER;
-			name = numeric_ids ? NULL : add_uid(ida->id);
+			name = add_uid(ida->id);
 		} else
-			name = numeric_ids ? NULL : add_gid(ida->id);
+			name = add_gid(ida->id);
 		write_varint(f, ida->id);
 		if (inc_recurse && name) {
 			int len = strlen(name);
@@ -834,8 +583,8 @@ static void send_ida_entries(int f, const ida_entries *idal)
 	}
 }

-static void send_rsync_acl(int f, rsync_acl *racl, SMB_ACL_TYPE_T type,
-			   item_list *racl_list)
+static void send_rsync_acl(rsync_acl *racl, SMB_ACL_TYPE_T type,
+			   item_list *racl_list, int f)
 {
 	int ndx = find_matching_rsync_acl(racl, type, racl_list);

@@ -868,7 +617,7 @@ static void send_rsync_acl(int f, rsync_acl *racl, SMB_ACL_TYPE_T type,
 		if (flags & XMIT_OTHER_OBJ)
 			write_varint(f, racl->other_obj);
 		if (flags & XMIT_NAME_LIST)
-			send_ida_entries(f, &racl->names);
+			send_ida_entries(&racl->names, f);

 		/* Give the allocated data to the new list object. */
 		*new_racl = *racl;
@@ -878,28 +627,28 @@ static void send_rsync_acl(int f, rsync_acl *racl, SMB_ACL_TYPE_T type,

 /* Send the ACL from the stat_x structure down the indicated file descriptor.
 * This also frees the ACL data. */
-void send_acl(int f, stat_x *sxp)
+void send_acl(stat_x *sxp, int f)
 {
 	if (!sxp->acc_acl) {
 		sxp->acc_acl = create_racl();
 		rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
 	}
 	/* Avoid sending values that can be inferred from other data. */
-	rsync_acl_strip_perms(sxp);
+	rsync_acl_strip_perms(sxp->acc_acl);

-	send_rsync_acl(f, sxp->acc_acl, SMB_ACL_TYPE_ACCESS, &access_acl_list);
+	send_rsync_acl(sxp->acc_acl, SMB_ACL_TYPE_ACCESS, &access_acl_list, f);

 	if (S_ISDIR(sxp->st.st_mode)) {
 		if (!sxp->def_acl)
 			sxp->def_acl = create_racl();

-		send_rsync_acl(f, sxp->def_acl, SMB_ACL_TYPE_DEFAULT, &default_acl_list);
+		send_rsync_acl(sxp->def_acl, SMB_ACL_TYPE_DEFAULT, &default_acl_list, f);
 	}
 }

 /* === Receive functions === */

-static uint32 recv_acl_access(int f, uchar *name_follows_ptr)
+static uint32 recv_acl_access(uchar *name_follows_ptr, int f)
 {
 	uint32 access = read_varint(f);

@@ -924,18 +673,23 @@ static uint32 recv_acl_access(int f, uchar *name_follows_ptr)
 	return access;
 }

-static uchar recv_ida_entries(int f, ida_entries *ent)
+static uchar recv_ida_entries(ida_entries *ent, int f)
 {
 	uchar computed_mask_bits = 0;
-	int i, count = read_varint_bounded(f, 0, MAX_WIRE_ACL_COUNT, "ACL count");
+	int i, count = read_varint(f);
+
+	if (count) {
+		if (!(ent->idas = new_array(id_access, count)))
+			out_of_memory("recv_ida_entries");
+	} else
+		ent->idas = NULL;

-	ent->idas = count ? new_array(id_access, count) : NULL;
 	ent->count = count;

 	for (i = 0; i < count; i++) {
 		uchar has_name;
 		id_t id = read_varint(f);
-		uint32 access = recv_acl_access(f, &has_name);
+		uint32 access = recv_acl_access(&has_name, f);

 		if (has_name) {
 			if (access & NAME_IS_USER)
@@ -943,7 +697,7 @@ static uchar recv_ida_entries(int f, ida_entries *ent)
 			else
 				id = recv_group_name(f, id, NULL);
 		} else if (access & NAME_IS_USER) {
-			if (inc_recurse && !numeric_ids)
+			if (inc_recurse && am_root && !numeric_ids)
 				id = match_uid(id);
 		} else {
 			if (inc_recurse && (!am_root || !numeric_ids))
@@ -958,7 +712,7 @@ static uchar recv_ida_entries(int f, ida_entries *ent)
 	return computed_mask_bits & ~NO_ENTRY;
 }

-static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode_t mode)
+static int recv_rsync_acl(item_list *racl_list, SMB_ACL_TYPE_T type, int f)
 {
 	uchar computed_mask_bits = 0;
 	acl_duo *duo_item;
@@ -973,7 +727,7 @@ static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode

 	if (ndx != 0)
 		return ndx - 1;
-
+	
 	ndx = racl_list->count;
 	duo_item = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
 	duo_item->racl = empty_rsync_acl;
@@ -981,30 +735,29 @@ static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode
 	flags = read_byte(f);

 	if (flags & XMIT_USER_OBJ)
-		duo_item->racl.user_obj = recv_acl_access(f, NULL);
+		duo_item->racl.user_obj = recv_acl_access(NULL, f);
 	if (flags & XMIT_GROUP_OBJ)
-		duo_item->racl.group_obj = recv_acl_access(f, NULL);
+		duo_item->racl.group_obj = recv_acl_access(NULL, f);
 	if (flags & XMIT_MASK_OBJ)
-		duo_item->racl.mask_obj = recv_acl_access(f, NULL);
+		duo_item->racl.mask_obj = recv_acl_access(NULL, f);
 	if (flags & XMIT_OTHER_OBJ)
-		duo_item->racl.other_obj = recv_acl_access(f, NULL);
+		duo_item->racl.other_obj = recv_acl_access(NULL, f);
 	if (flags & XMIT_NAME_LIST)
-		computed_mask_bits |= recv_ida_entries(f, &duo_item->racl.names);
+		computed_mask_bits |= recv_ida_entries(&duo_item->racl.names, f);

 #ifdef HAVE_OSX_ACLS
 	/* If we received a superfluous mask, throw it away. */
 	duo_item->racl.mask_obj = NO_ENTRY;
-	(void)mode;
-	(void)computed_mask_bits;
 #else
-	if (duo_item->racl.names.count && duo_item->racl.mask_obj == NO_ENTRY) {
-		/* Mask must be non-empty with lists. */
-		if (type == SMB_ACL_TYPE_ACCESS)
-			computed_mask_bits = (mode >> 3) & 7;
-		else
-			computed_mask_bits |= duo_item->racl.group_obj & ~NO_ENTRY;
-		duo_item->racl.mask_obj = computed_mask_bits;
-	}
+	if (!duo_item->racl.names.count) {
+		/* If we received a superfluous mask, throw it away. */
+		if (duo_item->racl.mask_obj != NO_ENTRY) {
+			/* Mask off the group perms with it first. */
+			duo_item->racl.group_obj &= duo_item->racl.mask_obj | NO_ENTRY;
+			duo_item->racl.mask_obj = NO_ENTRY;
+		}
+	} else if (duo_item->racl.mask_obj == NO_ENTRY) /* Must be non-empty with lists. */
+		duo_item->racl.mask_obj = (computed_mask_bits | duo_item->racl.group_obj) & ~NO_ENTRY;
 #endif

 	duo_item->sacl = NULL;
@@ -1013,12 +766,12 @@ static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode
 }

 /* Receive the ACL info the sender has included for this file-list entry. */
-void receive_acl(int f, struct file_struct *file)
+void receive_acl(struct file_struct *file, int f)
 {
-	F_ACL(file) = recv_rsync_acl(f, &access_acl_list, SMB_ACL_TYPE_ACCESS, file->mode);
+	F_ACL(file) = recv_rsync_acl(&access_acl_list, SMB_ACL_TYPE_ACCESS, f);

 	if (S_ISDIR(file->mode))
-		F_DIR_DEFACL(file) = recv_rsync_acl(f, &default_acl_list, SMB_ACL_TYPE_DEFAULT, 0);
+		F_DIR_DEFACL(file) = recv_rsync_acl(&default_acl_list, SMB_ACL_TYPE_DEFAULT, f);
 }

 static int cache_rsync_acl(rsync_acl *racl, SMB_ACL_TYPE_T type, item_list *racl_list)
@@ -1041,45 +794,14 @@ static int cache_rsync_acl(rsync_acl *racl, SMB_ACL_TYPE_T type, item_list *racl

 /* Turn the ACL data in stat_x into cached ACL data, setting the index
 * values in the file struct. */
-void cache_tmp_acl(struct file_struct *file, stat_x *sxp)
+void cache_acl(struct file_struct *file, stat_x *sxp)
 {
-	if (prior_access_count == (size_t)-1)
-		prior_access_count = access_acl_list.count;
-
-	F_ACL(file) = cache_rsync_acl(sxp->acc_acl, SMB_ACL_TYPE_ACCESS, &access_acl_list);
+	F_ACL(file) = cache_rsync_acl(sxp->acc_acl,
+				      SMB_ACL_TYPE_ACCESS, &access_acl_list);

 	if (S_ISDIR(sxp->st.st_mode)) {
-		if (prior_default_count == (size_t)-1)
-			prior_default_count = default_acl_list.count;
-		F_DIR_DEFACL(file) = cache_rsync_acl(sxp->def_acl, SMB_ACL_TYPE_DEFAULT, &default_acl_list);
-	}
-}
-
-static void uncache_duo_acls(item_list *duo_list, size_t start)
-{
-	acl_duo *duo_item = duo_list->items;
-	acl_duo *duo_start = duo_item + start;
-
-	duo_item += duo_list->count;
-	duo_list->count = start;
-
-	while (duo_item-- > duo_start) {
-		rsync_acl_free(&duo_item->racl);
-		if (duo_item->sacl)
-			sys_acl_free_acl(duo_item->sacl);
-	}
-}
-
-void uncache_tmp_acls(void)
-{
-	if (prior_access_count != (size_t)-1) {
-		uncache_duo_acls(&access_acl_list, prior_access_count);
-		prior_access_count = (size_t)-1;
-	}
-
-	if (prior_default_count != (size_t)-1) {
-		uncache_duo_acls(&default_acl_list, prior_default_count);
-		prior_default_count = (size_t)-1;
+		F_DIR_DEFACL(file) = cache_rsync_acl(sxp->def_acl,
+				      SMB_ACL_TYPE_DEFAULT, &default_acl_list);
 	}
 }

@@ -1128,14 +850,12 @@ static mode_t change_sacl_perms(SMB_ACL_T sacl, rsync_acl *racl, mode_t old_mode
 			COE2( store_access_in_entry,((mode >> 3) & 7, entry) );
 			break;
 		case SMB_ACL_MASK:
-#ifndef HAVE_SOLARIS_ACLS
 #ifndef ACLS_NEED_MASK
 			/* mask is only empty when we don't need it. */
 			if (racl->mask_obj == NO_ENTRY)
 				break;
 #endif
 			COE2( store_access_in_entry,((mode >> 3) & 7, entry) );
-#endif
 			break;
 		case SMB_ACL_OTHER:
 			COE2( store_access_in_entry,(mode & 7, entry) );
@@ -1148,7 +868,7 @@ static mode_t change_sacl_perms(SMB_ACL_T sacl, rsync_acl *racl, mode_t old_mode
 			rsyserr(FERROR_XFER, errno, "change_sacl_perms: %s()",
 				errfun);
 		}
-		return (mode_t)-1;
+		return (mode_t)~0;
 	}

 #ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
@@ -1163,60 +883,17 @@ static mode_t change_sacl_perms(SMB_ACL_T sacl, rsync_acl *racl, mode_t old_mode
 }
 #endif

-static int set_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
-			 acl_duo *duo_item, SMB_ACL_TYPE_T type, stat_x *sxp, mode_t mode)
+static int set_rsync_acl(const char *fname, acl_duo *duo_item,
+			 SMB_ACL_TYPE_T type, stat_x *sxp, mode_t mode)
 {
-#ifndef SUPPORT_ACL_FD
-#ifndef HAVE_SOLARIS_ACLS
-	(void)fd; /* Solaris drives the ACL via facl(2) on fd but has no SUPPORT_ACL_FD. */
-#endif
-	(void)dirfd;
-	(void)leaf;
-#endif
 	if (type == SMB_ACL_TYPE_DEFAULT
 	 && duo_item->racl.user_obj == NO_ENTRY) {
 		int rc;
 #ifdef SUPPORT_XATTRS
 		/* --fake-super support: delete default ACL from xattrs. */
 		if (am_root < 0)
-			rc = del_def_xattr_acl(fd, fname);
+			rc = del_def_xattr_acl(fname);
 		else
-#endif
-#ifdef SUPPORT_ACL_FD
-#ifdef HAVE_LIBACL_AT
-		/* Race-safe default-ACL delete via the new libacl *_at
-		 * calls (held fd via AT_EMPTY_PATH, dirfd+leaf via AT_SYMLINK_NOFOLLOW)
-		 * -- race-safe on every Linux kernel.  fd<0 && dirfd<0 falls to path. */
-		if (fd >= 0)
-			rc = sys_acl_delete_def_file_at(fd, "", AT_EMPTY_PATH);
-		else if (dirfd >= 0)
-			rc = sys_acl_delete_def_file_at(dirfd, leaf, AT_SYMLINK_NOFOLLOW);
-		else
-#else
-		/* Race-safe default-ACL delete via the held fd or dirfd+leaf.  Where
-		 * neither is available (xacl_at_available() is false -- the BSDs, a
-		 * /proc-less namespace, an un-pinnable entry; every Linux with procfs
-		 * takes the dirfd path via *xattrat or the /proc/self/fd compat) -- fall
-		 * back to the path-based call, preferring the documented --acls behaviour
-		 * over refusing it where the race-safe primitive is unavailable. */
-		if (fd >= 0)
-			rc = xacl_del_default_fd(fd);
-		else if (dirfd >= 0 && xacl_at_available())
-			rc = xacl_del_default_at(dirfd, leaf);
-		else
-#endif /* HAVE_LIBACL_AT */
-#endif
-#ifdef HAVE_SOLARIS_ACLS
-		/* Solaris: delete the default ACL through the held fd via facl(2).  For a
-		 * root receiver a missing held fd means the leaf was raced, so refuse rather
-		 * than let the path-based delete follow it; a plain non-root receiver keeps
-		 * the legacy path fallback (op_pin am_root != 0 rule). */
-		if (fd >= 0)
-			rc = sys_acl_delete_def_fd(fd);
-		else if (vfs_relpath_active() && am_root) {
-			errno = ELOOP;
-			rc = -1;
-		} else
 #endif
 			rc = sys_acl_delete_def_file(fname);
 		if (rc < 0) {
@@ -1245,7 +922,7 @@ static int set_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
 				SIVAL(bp, 4, ida->access);
 			}
 		}
-		rc = set_xattr_acl(fd, fname, type == SMB_ACL_TYPE_ACCESS, buf, len);
+		rc = set_xattr_acl(fname, type == SMB_ACL_TYPE_ACCESS, buf, len);
 		free(buf);
 		return rc;
 #endif
@@ -1255,99 +932,14 @@ static int set_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
 		 && !pack_smb_acl(&duo_item->sacl, &duo_item->racl))
 			return -1;
 #ifdef HAVE_OSX_ACLS
-		(void)mode; /* eliminate compiler warning */
+		mode = 0; /* eliminate compiler warning */
 #else
 		if (type == SMB_ACL_TYPE_ACCESS) {
-			cur_mode = change_sacl_perms(duo_item->sacl, &duo_item->racl, cur_mode, mode);
-			if (cur_mode == (mode_t)-1)
+			cur_mode = change_sacl_perms(duo_item->sacl, &duo_item->racl,
+						     cur_mode, mode);
+			if (cur_mode == (mode_t)~0)
 				return 0;
 		}
-#endif
-#ifdef SUPPORT_ACL_FD
-#ifdef HAVE_LIBACL_AT
-		/* Apply the packed/perm-reconciled ACL (duo_item->sacl)
-		 * through the new libacl *_at calls -- held fd via AT_EMPTY_PATH,
-		 * dirfd+leaf via AT_SYMLINK_NOFOLLOW -- race-safe on every Linux kernel,
-		 * and byte-identical to the path-based sys_acl_set_file() below. */
-		if (fd >= 0 || dirfd >= 0) {
-			int rc;
-
-			if (fd >= 0)
-				rc = sys_acl_set_file_at(fd, "", AT_EMPTY_PATH, type, duo_item->sacl);
-			else
-				rc = sys_acl_set_file_at(dirfd, leaf, AT_SYMLINK_NOFOLLOW, type, duo_item->sacl);
-			if (rc < 0) {
-				rsyserr(FERROR_XFER, errno, "set_acl: acl_set_file_at(%s, %s)",
-					fname, str_acl_type(type));
-				return -1;
-			}
-			if (type == SMB_ACL_TYPE_ACCESS)
-				sxp->st.st_mode = cur_mode;
-			return 0;
-		}
-#else
-		/* Race-safe write: serialize the packed (and perm-reconciled)
-		 * system ACL to the kernel xattr format and apply it through the
-		 * held fd or dirfd+leaf -- never re-resolving fname.  This matches
-		 * exactly what sys_acl_set_file() would have written. */
-		if (fd >= 0 || (dirfd >= 0 && xacl_at_available())) {
-			int is_def = type == SMB_ACL_TYPE_DEFAULT;
-			rsync_acl_ent *ents;
-			int n = sacl_to_entries(duo_item->sacl, &ents);
-			int rc;
-
-			if (n < 0)
-				return -1;
-			if (fd >= 0)
-				rc = xacl_set_fd(fd, is_def, ents, n);
-			else
-				rc = xacl_set_at(dirfd, leaf, is_def, ents, n);
-			free(ents);
-			if (rc < 0) {
-				rsyserr(FERROR_XFER, errno, "set_acl: xacl_set(%s, %s)",
-					fname, str_acl_type(type));
-				return -1;
-			}
-			if (type == SMB_ACL_TYPE_ACCESS)
-				sxp->st.st_mode = cur_mode;
-			return 0;
-		}
-		/* No held fd and no usable dirfd path (xacl_at_available() is false --
-		 * the BSDs, a /proc-less namespace, an un-pinnable entry; every Linux
-		 * with procfs took xacl_set_at() above via *xattrat or the /proc/self/fd
-		 * compat): prefer the documented --acls behaviour over refusing it and
-		 * fall back to the path-based set.  This re-resolves fname, so it still
-		 * carries the parent-symlink-race exposure on those remaining platforms;
-		 * it is the only way to honour --acls where no race-safe primitive
-		 * exists. */
-#endif /* HAVE_LIBACL_AT */
-#endif
-#ifdef HAVE_SOLARIS_ACLS
-		/* Solaris: apply the ACL through the held fd via facl(2). */
-		if (fd >= 0) {
-			if (sys_acl_set_fd_type(fd, type, duo_item->sacl) < 0) {
-				rsyserr(FERROR_XFER, errno, "set_acl: sys_acl_set_fd_type(%s, %s)",
-					fname, str_acl_type(type));
-				return -1;
-			}
-			if (type == SMB_ACL_TYPE_ACCESS)
-				sxp->st.st_mode = cur_mode;
-			return 0;
-		}
-		if (vfs_relpath_active() && am_root) {
-			/* Real root always can open its own freshly-staged reg/dir/fifo leaf,
-			 * so a missing held fd on a confined receiver means the leaf was raced
-			 * to a symlink; sys_acl_set_file() follows the leaf, so refuse rather
-			 * than write the attacker-supplied ACL onto a redirected inode (covers
-			 * the top-level no-slash entry the caller's slashed-path xattr_refuse
-			 * gate misses).  A plain non-root receiver keeps the path-based fallback
-			 * for a legitimately un-pinnable owned leaf (e.g. a 0300 dir), matching
-			 * the operator-path op_pin rule (am_root != 0). */
-			errno = ELOOP;
-			rsyserr(FERROR_XFER, errno, "set_acl: refusing path-based ACL on %s (no held fd)",
-				fname);
-			return -1;
-		}
 #endif
 		if (sys_acl_set_file(fname, type, duo_item->sacl) < 0) {
 			rsyserr(FERROR_XFER, errno, "set_acl: sys_acl_set_file(%s, %s)",
@@ -1361,22 +953,17 @@ static int set_rsync_acl(int fd, int dirfd, const char *leaf, const char *fname,
 	return 0;
 }

-/* Given a fname, this sets extended access ACL entries, the default ACL (for a
- * dir), and the regular mode bits on the file.  Call this with fname set to
- * NULL to just check if the ACL is different.
+/* Set ACL on indicated filename.
 *
- * When a held O_NOFOLLOW fd (or a dirfd+leaf) is supplied, the ACL is applied
- * race-safely through it; otherwise (fd < 0 && dirfd < 0) the path-based
- * fallback is used.
+ * This sets extended access ACL entries and default ACL.  If convenient,
+ * it sets permission bits along with the access ACL and signals having
+ * done so by modifying sxp->st.st_mode.
 *
- * If the ACL operation has a side-effect of changing the file's mode, the
- * sxp->st.st_mode value will be changed to match.
- *
- * Returns 0 for an unchanged ACL, 1 for changed, -1 for failed. */
-int set_acl_fdat(int fd, int dirfd, const char *leaf, const char *fname,
-		 const struct file_struct *file, stat_x *sxp, mode_t new_mode)
+ * Returns 1 for unchanged, 0 for changed, -1 for failed.  Call this
+ * with fname set to NULL to just check if the ACL is unchanged. */
+int set_acl(const char *fname, const struct file_struct *file, stat_x *sxp)
 {
-	int changed = 0;
+	int unchanged = 1;
 	int32 ndx;
 	BOOL eq;

@@ -1390,18 +977,18 @@ int set_acl_fdat(int fd, int dirfd, const char *leaf, const char *fname,
 		acl_duo *duo_item = access_acl_list.items;
 		duo_item += ndx;
 		eq = sxp->acc_acl
-		  && rsync_acl_equal_enough(sxp->acc_acl, &duo_item->racl, new_mode);
+		  && rsync_acl_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
 		if (!eq) {
-			changed = 1;
+			unchanged = 0;
 			if (!dry_run && fname
-			 && set_rsync_acl(fd, dirfd, leaf, fname, duo_item, SMB_ACL_TYPE_ACCESS,
-					  sxp, new_mode) < 0)
-				return -1;
+			 && set_rsync_acl(fname, duo_item, SMB_ACL_TYPE_ACCESS,
+					  sxp, file->mode) < 0)
+				unchanged = -1;
 		}
 	}

-	if (!S_ISDIR(new_mode))
-		return changed;
+	if (!S_ISDIR(sxp->st.st_mode))
+		return unchanged;

 	ndx = F_DIR_DEFACL(file);
 	if (ndx >= 0 && (size_t)ndx < default_acl_list.count) {
@@ -1409,20 +996,16 @@ int set_acl_fdat(int fd, int dirfd, const char *leaf, const char *fname,
 		duo_item += ndx;
 		eq = sxp->def_acl && rsync_acl_equal(sxp->def_acl, &duo_item->racl);
 		if (!eq) {
-			changed = 1;
+			if (unchanged > 0)
+				unchanged = 0;
 			if (!dry_run && fname
-			 && set_rsync_acl(fd, dirfd, leaf, fname, duo_item, SMB_ACL_TYPE_DEFAULT,
-					  sxp, new_mode) < 0)
-				return -1;
+			 && set_rsync_acl(fname, duo_item, SMB_ACL_TYPE_DEFAULT,
+					  sxp, file->mode) < 0)
+				unchanged = -1;
 		}
 	}

-	return changed;
-}
-
-int set_acl(const char *fname, const struct file_struct *file, stat_x *sxp, mode_t new_mode)
-{
-	return set_acl_fdat(-1, -1, NULL, fname, file, sxp, new_mode);
+	return unchanged;
 }

 /* Non-incremental recursion needs to convert all the received IDs.
@@ -1465,21 +1048,20 @@ int default_perms_for_dir(const char *dir)
 	if (sacl == NULL) {
 		/* Couldn't get an ACL.  Darn. */
 		switch (errno) {
-		case EINVAL:
-			/* If SMB_ACL_TYPE_DEFAULT isn't valid, then the ACLs must be non-POSIX. */
-			break;
 #ifdef ENOTSUP
 		case ENOTSUP:
 #endif
 		case ENOSYS:
 			/* No ACLs are available. */
 			break;
-		default:
-			if (dry_run && errno == ENOENT) {
+		case ENOENT:
+			if (dry_run) {
 				/* We're doing a dry run, so the containing directory
 				 * wasn't actually created.  Don't worry about it. */
 				break;
 			}
+			/* Otherwise fall through. */
+		default:
 			rprintf(FWARNING,
 				"default_perms_for_dir: sys_acl_get_file(%s, %s): %s, falling back on umask\n",
 				dir, str_acl_type(SMB_ACL_TYPE_DEFAULT), strerror(errno));
@@ -1499,7 +1081,7 @@ int default_perms_for_dir(const char *dir)
 	/* Apply the permission-bit entries of the default ACL, if any. */
 	if (racl.user_obj != NO_ENTRY) {
 		perms = rsync_acl_get_perms(&racl);
-		if (DEBUG_GTE(ACL, 1))
+		if (verbose > 2)
 			rprintf(FINFO, "got ACL-based default perms %o for directory %s\n", perms, dir);
 	}

@@ -2,7 +2,7 @@
 * Support rsync daemon authentication.
 *
 * Copyright (C) 1998-2000 Andrew Tridgell
- * Copyright (C) 2002-2022 Wayne Davison
+ * Copyright (C) 2002-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,19 +19,8 @@
 */

 #include "rsync.h"
-#include "itypes.h"
-#include "ifuncs.h"

-/* O_CLOEXEC is absent on some still-supported targets.  The random-source fd
- * is read and closed synchronously, so the established zero-value fallback is
- * sufficient without adding a configure dependency. */
-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
-
-extern int read_only;
 extern char *password_file;
-extern struct name_num_obj valid_auth_checksums;

 /***************************************************************************
 encode a buffer using base64 - simple and slow algorithm. null terminates
@@ -64,31 +53,10 @@ void base64_encode(const char *buf, int len, char *out, int pad)
 	out[i] = '\0';
 }

-/* Fill buf with len bytes from the kernel CSPRNG.  Returns 1 on success.
- * We read /dev/urandom directly rather than depending on getrandom()/
- * arc4random_buf() availability so this works on every platform rsync
- * targets without new configure probes. */
-static int get_random_bytes(char *buf, int len)
-{
-	int fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
-	int got = 0;
-	if (fd < 0)
-		return 0;
-	while (got < len) {
-		int n = read(fd, buf + got, len - got);
-		if (n <= 0)
-			break;
-		got += n;
-	}
-	close(fd);
-	return got == len;
-}
-
 /* Generate a challenge buffer and return it base64-encoded. */
 static void gen_challenge(const char *addr, char *challenge)
 {
 	char input[32];
-	char rnd[32];
 	char digest[MAX_DIGEST_LEN];
 	struct timeval tv;
 	int len;
@@ -101,23 +69,136 @@ static void gen_challenge(const char *addr, char *challenge)
 	SIVAL(input, 20, tv.tv_usec);
 	SIVAL(input, 24, getpid());

-	len = sum_init(valid_auth_checksums.negotiated_nni, 0);
-	/* The challenge must be unpredictable to a network observer; addr+time
-	 * +pid alone is ~35 bits and lets an attacker enumerate the preimage
-	 * offline.  Hash 32 bytes from the kernel RNG first so the digest
-	 * carries full entropy, keeping the legacy inputs as a mix-in so a
-	 * urandom failure degrades to (never below) the old behaviour. */
-	if (get_random_bytes(rnd, sizeof rnd))
-		sum_update(rnd, sizeof rnd);
-	else
-		rprintf(FWARNING, "gen_challenge: /dev/urandom unavailable, "
-			"falling back to time-based challenge\n");
+	sum_init(0);
 	sum_update(input, sizeof input);
-	sum_end(digest);
+	len = sum_end(digest);

 	base64_encode(digest, len, challenge, 0);
 }

+
+/* Return the secret for a user from the secret file, null terminated.
+ * Maximum length is len (not counting the null). */
+static int get_secret(int module, const char *user, char *secret, int len)
+{
+	const char *fname = lp_secrets_file(module);
+	STRUCT_STAT st;
+	int fd, ok = 1;
+	const char *p;
+	char ch, *s;
+
+	if (!fname || !*fname)
+		return 0;
+
+	if ((fd = open(fname, O_RDONLY)) < 0)
+		return 0;
+
+	if (do_stat(fname, &st) == -1) {
+		rsyserr(FLOG, errno, "stat(%s)", fname);
+		ok = 0;
+	} else if (lp_strict_modes(module)) {
+		if ((st.st_mode & 06) != 0) {
+			rprintf(FLOG, "secrets file must not be other-accessible (see strict modes option)\n");
+			ok = 0;
+		} else if (MY_UID() == 0 && st.st_uid != 0) {
+			rprintf(FLOG, "secrets file must be owned by root when running as root (see strict modes)\n");
+			ok = 0;
+		}
+	}
+	if (!ok) {
+		rprintf(FLOG, "continuing without secrets file\n");
+		close(fd);
+		return 0;
+	}
+
+	if (*user == '#') {
+		/* Reject attempt to match a comment. */
+		close(fd);
+		return 0;
+	}
+
+	/* Try to find a line that starts with the user name and a ':'. */
+	p = user;
+	while (1) {
+		if (read(fd, &ch, 1) != 1) {
+			close(fd);
+			return 0;
+		}
+		if (ch == '\n')
+			p = user;
+		else if (p) {
+			if (*p == ch)
+				p++;
+			else if (!*p && ch == ':')
+				break;
+			else
+				p = NULL;
+		}
+	}
+
+	/* Slurp the secret into the "secret" buffer. */
+	s = secret;
+	while (len > 0) {
+		if (read(fd, s, 1) != 1 || *s == '\n')
+			break;
+		if (*s == '\r')
+			continue;
+		s++;
+		len--;
+	}
+	*s = '\0';
+	close(fd);
+
+	return 1;
+}
+
+static const char *getpassf(const char *filename)
+{
+	STRUCT_STAT st;
+	char buffer[512], *p;
+	int fd, n, ok = 1;
+	const char *envpw = getenv("RSYNC_PASSWORD");
+
+	if (!filename)
+		return NULL;
+
+	if ((fd = open(filename,O_RDONLY)) < 0) {
+		rsyserr(FWARNING, errno, "could not open password file \"%s\"",
+			filename);
+		if (envpw)
+			rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
+		return NULL;
+	}
+
+	if (do_stat(filename, &st) == -1) {
+		rsyserr(FWARNING, errno, "stat(%s)", filename);
+		ok = 0;
+	} else if ((st.st_mode & 06) != 0) {
+		rprintf(FWARNING, "password file must not be other-accessible\n");
+		ok = 0;
+	} else if (MY_UID() == 0 && st.st_uid != 0) {
+		rprintf(FWARNING, "password file must be owned by root when running as root\n");
+		ok = 0;
+	}
+	if (!ok) {
+		close(fd);
+		rprintf(FWARNING, "continuing without password file\n");
+		if (envpw)
+			rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n");
+		return NULL;
+	}
+
+	n = read(fd, buffer, sizeof buffer - 1);
+	close(fd);
+	if (n > 0) {
+		buffer[n] = '\0';
+		if ((p = strtok(buffer, "\n\r")) != NULL)
+			return strdup(p);
+	}
+
+	return NULL;
+}
+
 /* Generate an MD4 hash created from the combination of the password
 * and the challenge string and return it base64-encoded. */
 static void generate_hash(const char *in, const char *challenge, char *out)
@@ -125,160 +206,14 @@ static void generate_hash(const char *in, const char *challenge, char *out)
 	char buf[MAX_DIGEST_LEN];
 	int len;

-	len = sum_init(valid_auth_checksums.negotiated_nni, 0);
+	sum_init(0);
 	sum_update(in, strlen(in));
 	sum_update(challenge, strlen(challenge));
-	sum_end(buf);
+	len = sum_end(buf);

 	base64_encode(buf, len, out, 0);
 }

-/* Return the secret for a user from the secret file, null terminated.
- * Maximum length is len (not counting the null). */
-static const char *check_secret(int module, const char *user, const char *group,
-				const char *challenge, const char *pass)
-{
-	char line[1024];
-	char pass2[MAX_DIGEST_LEN*2];
-	const char *fname = lp_secrets_file(module);
-	STRUCT_STAT st;
-	int ok = 1;
-	int user_len = strlen(user);
-	int group_len = group ? strlen(group) : 0;
-	char *err;
-	FILE *fh;
-
-	/* Daemon 'secrets file = PATH' open.  A planted symlink would be
-	 * followed and the strict-modes fstat() check below runs on the target
-	 * inode, so a symlink to /etc/shadow (0640 root:shadow) would pass and
-	 * the daemon would auth against shadow hashes.  Refuse symlinks not
-	 * owned by uid 0 or our euid. */
-	if (!fname || !*fname)
-		return "no secrets file";
-	{
-		int fd = vfs_open_owner_walk(fname, O_RDONLY, 0, 0);
-		if (fd < 0)
-			return "no secrets file";
-		fh = fdopen(fd, "r");
-		if (!fh) {
-			close(fd);
-			return "no secrets file";
-		}
-	}
-
-	if (vfs_fstat(fileno(fh), &st) == -1) {
-		rsyserr(FLOG, errno, "fstat(%s)", fname);
-		ok = 0;
-	} else if (lp_strict_modes(module)) {
-		if ((st.st_mode & 06) != 0) {
-			rprintf(FLOG, "secrets file must not be other-accessible (see strict modes option)\n");
-			ok = 0;
-		} else if (MY_UID() == ROOT_UID && st.st_uid != ROOT_UID) {
-			rprintf(FLOG, "secrets file must be owned by root when running as root (see strict modes)\n");
-			ok = 0;
-		}
-	}
-	if (!ok) {
-		fclose(fh);
-		return "ignoring secrets file";
-	}
-
-	if (*user == '#') {
-		/* Reject attempt to match a comment. */
-		fclose(fh);
-		return "invalid username";
-	}
-
-	/* Try to find a line that starts with the user (or @group) name and a ':'. */
-	err = "secret not found";
-	while ((user || group) && fgets(line, sizeof line, fh) != NULL) {
-		const char **ptr, *s = strtok(line, "\n\r");
-		int len;
-		if (!s)
-			continue;
-		if (*s == '@') {
-			ptr = &group;
-			len = group_len;
-			s++;
-		} else {
-			ptr = &user;
-			len = user_len;
-		}
-		if (!*ptr || strncmp(s, *ptr, len) != 0 || s[len] != ':')
-			continue;
-		generate_hash(s+len+1, challenge, pass2);
-		if (strcmp(pass, pass2) == 0) {
-			err = NULL;
-			break;
-		}
-		err = "password mismatch";
-		*ptr = NULL; /* Don't look for name again. */
-	}
-
-	fclose(fh);
-
-	force_memzero(line, sizeof line);
-	force_memzero(pass2, sizeof pass2);
-
-	return err;
-}
-
-static const char *getpassf(const char *filename)
-{
-	STRUCT_STAT st;
-	char buffer[512], *p;
-	int n;
-
-	if (!filename)
-		return NULL;
-
-	if (strcmp(filename, "-") == 0) {
-		n = fgets(buffer, sizeof buffer, stdin) == NULL ? -1 : (int)strlen(buffer);
-	} else {
-		int fd;
-
-		/* --password-file=PATH client open.  Its first line is sent as the
-		 * auth response, so a planted symlink leaks the target's content
-		 * (e.g. shadow hashes) to a malicious daemon; the vfs_stat()
-		 * other-access check runs on the target mode and passes 0640
-		 * root:shadow.  Refuse symlinks not owned by uid 0 or our euid. */
-		if ((fd = vfs_open_owner_walk(filename, O_RDONLY, 0, 0)) < 0) {
-			rsyserr(FERROR, errno, "could not open password file %s", filename);
-			exit_cleanup(RERR_SYNTAX);
-		}
-
-		/* fstat the opened fd, not the pathname: a same-object check
-		 * (matching check_secret() above) so an attacker who swaps the
-		 * path between open and check can't make the owner/mode test
-		 * validate a different inode than the one we read the password
-		 * from. */
-		if (vfs_fstat(fd, &st) == -1) {
-			rsyserr(FERROR, errno, "fstat(%s)", filename);
-			exit_cleanup(RERR_SYNTAX);
-		}
-		if ((st.st_mode & 06) != 0) {
-			rprintf(FERROR, "ERROR: password file must not be other-accessible\n");
-			exit_cleanup(RERR_SYNTAX);
-		}
-		if (MY_UID() == ROOT_UID && st.st_uid != ROOT_UID) {
-			rprintf(FERROR, "ERROR: password file must be owned by root when running as root\n");
-			exit_cleanup(RERR_SYNTAX);
-		}
-
-		n = read(fd, buffer, sizeof buffer - 1);
-		close(fd);
-	}
-
-	if (n > 0) {
-		buffer[n] = '\0';
-		if ((p = strtok(buffer, "\n\r")) != NULL)
-			return strdup(p);
-	}
-
-	rprintf(FERROR, "ERROR: failed to read a password from %s\n", filename);
-	exit_cleanup(RERR_SYNTAX);
-}
-
 /* Possibly negotiate authentication with the client.  Use "leader" to
 * start off the auth if necessary.
 *
@@ -291,52 +226,19 @@ char *auth_server(int f_in, int f_out, int module, const char *host,
 	char *users = lp_auth_users(module);
 	char challenge[MAX_DIGEST_LEN*2];
 	char line[BIGPATHBUFLEN];
-	const char **auth_uid_groups = NULL;
-	int auth_uid_groups_cnt = -1;
-	const char *err = NULL;
-	int group_match = -1;
+	char secret[512];
+	char pass2[MAX_DIGEST_LEN*2];
 	char *tok, *pass;
-	char opt_ch = '\0';

 	/* if no auth list then allow anyone in! */
 	if (!users || !*users)
 		return "";

-	negotiate_daemon_auth(f_out, 0);
-
-	/* Enforce a configured minimum auth digest (default: none).  This refuses
-	 * a peer that negotiated -- or, via an omitted digest list / old protocol,
-	 * fell back to -- a digest weaker than the operator-required floor, e.g. a
-	 * client downgraded to md5/md4.  Lower rank == stronger (the auth list is
-	 * ordered strongest-first), so a higher rank than the floor is too weak. */
-	{
-		const char *min_digest = lp_auth_digest(module);
-		if (min_digest && *min_digest) {
-			int floor_rank = auth_digest_rank(min_digest);
-			int got_rank = auth_digest_rank(valid_auth_checksums.negotiated_nni->name);
-			if (floor_rank < 0) {
-				rprintf(FLOG, "auth failed on module %s from %s (%s): the "
-					"configured 'auth digest = %s' is not a supported digest "
-					"on this build\n",
-					lp_name(module), host, addr, min_digest);
-				return NULL;
-			}
-			if (got_rank < 0 || got_rank > floor_rank) {
-				rprintf(FLOG, "auth failed on module %s from %s (%s): negotiated "
-					"auth digest %s is weaker than the required "
-					"'auth digest = %s'\n",
-					lp_name(module), host, addr,
-					valid_auth_checksums.negotiated_nni->name, min_digest);
-				return NULL;
-			}
-		}
-	}
-
 	gen_challenge(addr, challenge);

 	io_printf(f_out, "%s%s\n", leader, challenge);

-	if (!read_line_old(f_in, line, sizeof line, 0)
+	if (!read_line_old(f_in, line, sizeof line)
 	 || (pass = strchr(line, ' ')) == NULL) {
 		rprintf(FLOG, "auth failed on module %s from %s (%s): "
 			"invalid challenge response\n",
@@ -345,100 +247,40 @@ char *auth_server(int f_in, int f_out, int module, const char *host,
 	}
 	*pass++ = '\0';

-	users = strdup(users);
+	if (!(users = strdup(users)))
+		out_of_memory("auth_server");

-	/* conf_strtok() honours the documented leading-comma form: a value that
-	 * starts with a comma splits on commas ALONE, so an entry may contain
-	 * spaces -- which is how a group name with a space is written.  Splitting
-	 * on whitespace here tore such an entry apart, so the rule the admin wrote
-	 * never matched and a rule they never wrote appeared from its tail.  The
-	 * daemon's gid field already uses this parser (clientserver.c). */
-	for (tok = conf_strtok(users); tok; tok = conf_strtok(NULL)) {
-		char *opts;
-		/* See if the user appended :deny, :ro, or :rw. */
-		if ((opts = strchr(tok, ':')) != NULL) {
-			*opts++ = '\0';
-			opt_ch = isUpper(opts) ? toLower(opts) : *opts;
-			if (opt_ch == 'r') { /* handle ro and rw */
-				opt_ch = isUpper(opts+1) ? toLower(opts+1) : opts[1];
-				if (opt_ch == 'o')
-					opt_ch = 'r';
-				else if (opt_ch != 'w')
-					opt_ch = '\0';
-			} else if (opt_ch != 'd') /* if it's not deny, ignore it */
-				opt_ch = '\0';
-		} else
-			opt_ch = '\0';
-		if (*tok != '@') {
-			/* Match the username */
-			if (wildmatch(tok, line))
-				break;
-		} else {
-#ifdef HAVE_GETGROUPLIST
-			int j;
-			/* See if authorizing user is a real user, and if so, see
-			 * if it is in a group that matches tok+1 wildmat. */
-			if (auth_uid_groups_cnt < 0) {
-				item_list gid_list = EMPTY_ITEM_LIST;
-				uid_t auth_uid;
-				if (!user_to_uid(line, &auth_uid, False)
-				 || getallgroups(auth_uid, &gid_list) != NULL)
-					auth_uid_groups_cnt = 0;
-				else {
-					gid_t *gid_array = gid_list.items;
-					auth_uid_groups_cnt = gid_list.count;
-					auth_uid_groups = new_array(const char *, auth_uid_groups_cnt);
-					for (j = 0; j < auth_uid_groups_cnt; j++)
-						auth_uid_groups[j] = gid_to_group(gid_array[j]);
-				}
-			}
-			for (j = 0; j < auth_uid_groups_cnt; j++) {
-				if (auth_uid_groups[j] && wildmatch(tok+1, auth_uid_groups[j])) {
-					group_match = j;
-					break;
-				}
-			}
-			if (group_match >= 0)
-				break;
-#else
-			rprintf(FLOG, "your computer doesn't support getgrouplist(), so no @group authorization is possible.\n");
-#endif
-		}
+	for (tok = strtok(users, " ,\t"); tok; tok = strtok(NULL, " ,\t")) {
+		if (wildmatch(tok, line))
+			break;
 	}
-
 	free(users);

-	if (!tok)
-		err = "no matching rule";
-	else if (opt_ch == 'd')
-		err = "denied by rule";
-	else {
-		const char *group = group_match >= 0 ? auth_uid_groups[group_match] : NULL;
-		err = check_secret(module, line, group, challenge, pass);
-	}
-
-	force_memzero(challenge, sizeof challenge);
-	force_memzero(pass, strlen(pass));
-
-	if (auth_uid_groups) {
-		int j;
-		for (j = 0; j < auth_uid_groups_cnt; j++) {
-			if (auth_uid_groups[j])
-				free((char*)auth_uid_groups[j]);
-		}
-		free(auth_uid_groups);
-	}
-
-	if (err) {
-		rprintf(FLOG, "auth failed on module %s from %s (%s) for %s: %s\n",
-			lp_name(module), host, addr, line, err);
+	if (!tok) {
+		rprintf(FLOG, "auth failed on module %s from %s (%s): "
+			"unauthorized user\n",
+			lp_name(module), host, addr);
 		return NULL;
 	}

-	if (opt_ch == 'r')
-		read_only = 1;
-	else if (opt_ch == 'w')
-		read_only = 0;
+	memset(secret, 0, sizeof secret);
+	if (!get_secret(module, line, secret, sizeof secret - 1)) {
+		memset(secret, 0, sizeof secret);
+		rprintf(FLOG, "auth failed on module %s from %s (%s): "
+			"missing secret for user \"%s\"\n",
+			lp_name(module), host, addr, line);
+		return NULL;
+	}
+
+	generate_hash(secret, challenge, pass2);
+	memset(secret, 0, sizeof secret);
+
+	if (strcmp(pass, pass2) != 0) {
+		rprintf(FLOG, "auth failed on module %s from %s (%s): "
+			"password mismatch\n",
+			lp_name(module), host, addr);
+		return NULL;
+	}

 	return strdup(line);
 }
@@ -450,19 +292,18 @@ void auth_client(int fd, const char *user, const char *challenge)

 	if (!user || !*user)
 		user = "nobody";
-	negotiate_daemon_auth(-1, 1);

 	if (!(pass = getpassf(password_file))
 	 && !(pass = getenv("RSYNC_PASSWORD"))) {
 		/* XXX: cyeoh says that getpass is deprecated, because
 		 * it may return a truncated password on some systems,
 		 * and it is not in the LSB.
-		 *
-		 * Andrew Klein says that getpassphrase() is present
-		 * on Solaris and reads up to 256 characters.
-		 *
-		 * OpenBSD has a readpassphrase() that might be more suitable.
-		 */
+                 *
+                 * Andrew Klein says that getpassphrase() is present
+                 * on Solaris and reads up to 256 characters.
+                 *
+                 * OpenBSD has a readpassphrase() that might be more suitable.
+                 */
 		pass = getpass("Password: ");
 	}

@@ -2,7 +2,7 @@
 * Backup handling code.
 *
 * Copyright (C) 1999 Andrew Tridgell
- * Copyright (C) 2003-2022 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
 */

 #include "rsync.h"
-#include "ifuncs.h"

+extern int verbose;
 extern int am_root;
 extern int preserve_acls;
 extern int preserve_xattrs;
@@ -34,413 +34,329 @@ extern char backup_dir_buf[MAXPATHLEN];
 extern char *backup_suffix;
 extern char *backup_dir;

-/* Pin a backup SOURCE leaf with a confined O_NOFOLLOW fd (via the operator
- * owner-walk resolver, like set_file_attrs's op_leaf_fd) so the ACL/xattr the
- * backup caches off it are read through the held fd -- a parent-symlink race
- * can't redirect the read out of the module.  Returns -1 for a non-hardened
- * receiver (caller path-reads) or for a raced/absent leaf on a hardened one
- * (caller skips the cache rather than read through a flippable path; use
- * backup_metadata_hardened() to tell the two -1 cases apart). */
-int backup_metadata_hardened(void)
-{
-	return vfs_relpath_active() && !vfs_symlink_optout_allowed();
-}
-
-int backup_source_fd(const char *path)
-{
-#if defined AT_FDCWD && defined O_NOFOLLOW
-	if (backup_metadata_hardened() && path && *path)
-		return vfs_open_at(path, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_CLOEXEC, 0, VFS_OPERATOR_PATH);
-#endif
-	return -1;
-}
-
-/* Returns -1 on error, 0 on missing dir, and 1 on present dir. */
-static int validate_backup_dir(void)
-{
-	STRUCT_STAT st;
-
-	if (vfs_lstat(VFS_AT_FDCWD, backup_dir_buf, &st, VFS_OPERATOR_PATH) < 0) {
-		if (errno == ENOENT)
-			return 0;
-		rsyserr(FERROR, errno, "backup lstat %s failed", backup_dir_buf);
-		return -1;
-	}
-	if (!S_ISDIR(st.st_mode)) {
-		int flags = get_del_for_flag(st.st_mode) | DEL_FOR_BACKUP | DEL_RECURSE;
-		if (delete_item(backup_dir_buf, st.st_mode, flags) == 0)
-			return 0;
-		return -1;
-	}
-	return 1;
-}
-
-/* Create a backup path from the given fname, putting the result into
- * backup_dir_buf.  Any new directories (compared to the prior backup
- * path) are ensured to exist as directories, replacing anything else
- * that may be in the way (e.g. a symlink). */
-static BOOL copy_valid_path(const char *fname)
-{
-	const char *f;
-	int val;
-	BOOL ret = True;
-	stat_x sx;
-	char *b, *rel = backup_dir_buf + backup_dir_len, *name = rel;
-
-	for (f = fname, b = rel; *f && *f == *b; f++, b++) {
-		if (*b == '/')
-			name = b + 1;
-	}
-
-	if (stringjoin(rel, backup_dir_remainder, fname, backup_suffix, NULL) >= backup_dir_remainder) {
-		rprintf(FERROR, "backup filename too long\n");
-		*name = '\0';
-		return False;
-	}
-
-	for ( ; ; name = b + 1) {
-		if ((b = strchr(name, '/')) == NULL)
-			return True;
-		*b = '\0';
-
-		val = validate_backup_dir();
-		if (val == 0)
-			break;
-		if (val < 0) {
-			*name = '\0';
-			return False;
-		}
-
-		*b = '/';
-	}
-
-	init_stat_x(&sx);
-
-	for ( ; b; name = b + 1, b = strchr(name, '/')) {
-		*b = '\0';
-
-		while (vfs_mkdir(VFS_AT_FDCWD, backup_dir_buf, ACCESSPERMS, VFS_OPERATOR_PATH) < 0) {
-			if (errno == EEXIST) {
-				val = validate_backup_dir();
-				if (val > 0)
-					break;
-				if (val == 0)
-					continue;
-			} else
-				rsyserr(FERROR, errno, "backup mkdir %s failed", backup_dir_buf);
-			*name = '\0';
-			ret = False;
-			goto cleanup;
-		}
-
-		/* Try to transfer the directory settings of the actual dir
-		 * that the files are coming from. */
-		if (x_stat(rel, &sx.st, NULL, VFS_OPERATOR_PATH) < 0)
-			rsyserr(FERROR, errno, "backup stat %s failed", full_fname(rel));
-		else {
-			struct file_struct *file;
-			if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
-				continue;
-#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
-			{	/* read the source dir's ACL/xattr through a confined fd */
-			int bfd = backup_source_fd(rel);
-			if (!backup_metadata_hardened() || bfd >= 0) {
-# ifdef SUPPORT_ACLS
-				if (preserve_acls && !S_ISLNK(file->mode)) {
-					get_acl_fdat(bfd, -1, NULL, rel, &sx);
-					cache_tmp_acl(file, &sx);
-					free_acl(&sx);
-				}
-# endif
-# ifdef SUPPORT_XATTRS
-				if (preserve_xattrs) {
-					get_xattr(rel, bfd, &sx);
-					cache_tmp_xattr(file, &sx);
-					free_xattr(&sx);
-				}
-# endif
-			}
-			if (bfd >= 0)
-				close(bfd);
-			}
-#endif
-			set_file_attrs(backup_dir_buf, file, NULL, NULL, ATTRS_OPERATOR_PATH);
-			unmake_file(file);
-		}
-
-		*b = '/';
-	}
-
-  cleanup:
-
-#ifdef SUPPORT_ACLS
-	uncache_tmp_acls();
-#endif
-#ifdef SUPPORT_XATTRS
-	uncache_tmp_xattrs();
-#endif
-
-	return ret;
-}
-
-/* Make a complete pathname for backup file and verify any new path elements. */
+/* make a complete pathname for backup file */
 char *get_backup_name(const char *fname)
 {
 	if (backup_dir) {
-		static int initialized = 0;
-		if (!initialized) {
-			char dirbuf[MAXPATHLEN];
-			int ret;
-			if (strlcpy(dirbuf, backup_dir_buf, sizeof dirbuf) >= sizeof dirbuf) {
-				errno = ENAMETOOLONG;
-				return NULL;
-			}
-			if (backup_dir_len > 1)
-				dirbuf[backup_dir_len-1] = '\0';
-			ret = vfs_make_path(dirbuf, 0, VFS_OPERATOR_PATH);
-			if (ret < 0)
-				return NULL;
-			initialized = 1;
-		}
-		/* copy fname into backup_dir_buf while validating the dirs. */
-		if (copy_valid_path(fname))
+		if (stringjoin(backup_dir_buf + backup_dir_len, backup_dir_remainder,
+			       fname, backup_suffix, NULL) < backup_dir_remainder)
+			return backup_dir_buf;
+	} else {
+		if (stringjoin(backup_dir_buf, MAXPATHLEN,
+			       fname, backup_suffix, NULL) < MAXPATHLEN)
 			return backup_dir_buf;
-		/* copy_valid_path() has printed an error message. */
-		return NULL;
 	}

-	if (stringjoin(backup_dir_buf, MAXPATHLEN, fname, backup_suffix, NULL) < MAXPATHLEN)
-		return backup_dir_buf;
-
 	rprintf(FERROR, "backup filename too long\n");
 	return NULL;
 }

-/* Has same return codes as make_backup(). */
-static inline int link_or_rename(const char *from, const char *to,
-				 BOOL prefer_rename, STRUCT_STAT *stp)
+/* simple backup creates a backup with a suffix in the same directory */
+static int make_simple_backup(const char *fname)
 {
-#ifdef SUPPORT_HARD_LINKS
-	if (!prefer_rename) {
-#ifndef CAN_HARDLINK_SYMLINK
-		if (S_ISLNK(stp->st_mode))
-			return 0; /* Use copy code. */
-#endif
-#ifndef CAN_HARDLINK_SPECIAL
-		if (IS_SPECIAL(stp->st_mode) || IS_DEVICE(stp->st_mode))
-			return 0; /* Use copy code. */
-#endif
-		/* from = the live dest file being backed up (a transfer path); to = the
-		 * --backup-dir path (operator).  Per-operand policy keeps the transfer
-		 * source under the secure receiver resolve and only owner-walks the
-		 * operator backup parent. */
-		if (vfs_link_at(from, to, 0, VFS_OPERATOR_PATH) == 0) {
-			if (DEBUG_GTE(BACKUP, 1))
-				rprintf(FINFO, "make_backup: HLINK %s successful.\n", from);
-			return 2;
+	int rename_errno;
+	const char *fnamebak = get_backup_name(fname);
+
+	if (!fnamebak)
+		return 0;
+
+	while (1) {
+		if (do_rename(fname, fnamebak) == 0) {
+			if (verbose > 1) {
+				rprintf(FINFO, "backed up %s to %s\n",
+					fname, fnamebak);
+			}
+			break;
 		}
-		/* We prefer to rename a regular file rather than copy it. */
-		if (!S_ISREG(stp->st_mode) || errno == EEXIST || errno == EISDIR)
-			return 0;
+		/* cygwin (at least version b19) reports EINVAL */
+		if (errno == ENOENT || errno == EINVAL)
+			break;
+
+		rename_errno = errno;
+		if (errno == EISDIR && do_rmdir(fnamebak) == 0)
+			continue;
+		if (errno == ENOTDIR && do_unlink(fnamebak) == 0)
+			continue;
+
+		rsyserr(FERROR, rename_errno, "rename %s to backup %s",
+			fname, fnamebak);
+		errno = rename_errno;
+		return 0;
 	}
-#endif
-	if (vfs_rename_at(from, to, 0, VFS_OPERATOR_PATH) == 0) {
-		if (stp->st_nlink > 1 && !S_ISDIR(stp->st_mode)) {
-			/* If someone has hard-linked the file into the backup
-			 * dir, rename() might return success but do nothing!  from is the
-			 * transfer-side source, so unlink it under the secure resolve (0). */
-			robust_unlink(from, 0); /* Just in case... */
+
+	return 1;
+}
+
+
+/****************************************************************************
+Create a directory given an absolute path, perms based upon another directory
+path
+****************************************************************************/
+int make_bak_dir(const char *fullpath)
+{
+	char fbuf[MAXPATHLEN], *rel, *end, *p;
+	struct file_struct *file;
+	int len = backup_dir_len;
+	stat_x sx;
+
+	while (*fullpath == '.' && fullpath[1] == '/') {
+		fullpath += 2;
+		len -= 2;
+	}
+
+	if (strlcpy(fbuf, fullpath, sizeof fbuf) >= sizeof fbuf)
+		return -1;
+
+	rel = fbuf + len;
+	end = p = rel + strlen(rel);
+
+	/* Try to find an existing dir, starting from the deepest dir. */
+	while (1) {
+		if (--p == fbuf)
+			return -1;
+		if (*p == '/') {
+			*p = '\0';
+			if (mkdir_defmode(fbuf) == 0)
+				break;
+			if (errno != ENOENT) {
+				rsyserr(FERROR, errno,
+					"make_bak_dir mkdir %s failed",
+					full_fname(fbuf));
+				return -1;
+			}
+		}
+	}
+
+	/* Make all the dirs that we didn't find on the way here. */
+	while (1) {
+		if (p >= rel) {
+			/* Try to transfer the directory settings of the
+			 * actual dir that the files are coming from. */
+			if (x_stat(rel, &sx.st, NULL) < 0) {
+				rsyserr(FERROR, errno,
+					"make_bak_dir stat %s failed",
+					full_fname(rel));
+			} else {
+#ifdef SUPPORT_ACLS
+				sx.acc_acl = sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+				sx.xattr = NULL;
+#endif
+				if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
+					continue;
+#ifdef SUPPORT_ACLS
+				if (preserve_acls && !S_ISLNK(file->mode)) {
+					get_acl(rel, &sx);
+					cache_acl(file, &sx);
+					free_acl(&sx);
+				}
+#endif
+#ifdef SUPPORT_XATTRS
+				if (preserve_xattrs) {
+					get_xattr(rel, &sx);
+					cache_xattr(file, &sx);
+					free_xattr(&sx);
+				}
+#endif
+				set_file_attrs(fbuf, file, NULL, NULL, 0);
+				unmake_file(file);
+			}
+		}
+		*p = '/';
+		p += strlen(p);
+		if (p == end)
+			break;
+		if (mkdir_defmode(fbuf) < 0) {
+			rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
+				full_fname(fbuf));
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+/* robustly move a file, creating new directory structures if necessary */
+static int robust_move(const char *src, char *dst)
+{
+	if (robust_rename(src, dst, NULL, 0755) < 0) {
+		int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+		if (errno == ENOENT && make_bak_dir(dst) == 0) {
+			if (robust_rename(src, dst, NULL, 0755) < 0)
+				save_errno = errno ? errno : save_errno;
+			else
+				save_errno = 0;
+		}
+		if (save_errno) {
+			errno = save_errno;
+			return -1;
 		}
-		if (DEBUG_GTE(BACKUP, 1))
-			rprintf(FINFO, "make_backup: RENAME %s successful.\n", from);
-		return 1;
 	}
 	return 0;
 }

-/* Hard-link, rename, or copy an item to the backup name.  Returns 0 for
- * failure, 1 if item was moved, 2 if item was duplicated or hard linked
- * into backup area, or 3 if item doesn't exist or isn't a regular file. */
-static int make_backup_inner(const char *fname, BOOL prefer_rename)
+
+/* If we have a --backup-dir, then we get here from make_backup().
+ * We will move the file to be deleted into a parallel directory tree. */
+static int keep_backup(const char *fname)
 {
 	stat_x sx;
 	struct file_struct *file;
-	int save_preserve_xattrs;
 	char *buf;
-	int ret = 0;
+	int save_preserve_xattrs = preserve_xattrs;
+	int kept = 0;
+	int ret_code;

-	init_stat_x(&sx);
-	/* Return success if no file to keep. */
-	if (x_lstat(fname, &sx.st, NULL, VFS_OPERATOR_PATH) < 0)
-		return 3;
-
-	if (!(buf = get_backup_name(fname)))
-		return 0;
-
-#ifdef SUPPORT_LINKS
-	/* Honor --safe-links BEFORE the hard-link / rename fast path.  When
-	 * CAN_HARDLINK_SYMLINK is defined, link_or_rename() would otherwise
-	 * hard-link an escaping symlink (e.g. ../../etc/passwd) into the backup
-	 * area and "goto success", skipping the safe_symlinks check in the
-	 * copy-fallback path below -- silently preserving an unsafe link that
-	 * --safe-links was meant to drop.  Match the copy path: don't back up an
-	 * unsafe symlink. */
-	if (preserve_links && S_ISLNK(sx.st.st_mode) && safe_symlinks) {
-		char lnkbuf[MAXPATHLEN];
-		int llen = vfs_readlink(fname, lnkbuf, MAXPATHLEN - 1);
-		/* A failed readlink means we can't verify the target, so fail
-		 * closed: skip the backup rather than let the hard-link fast path
-		 * preserve a possibly-unsafe symlink unchecked. */
-		if (llen <= 0) {
-			if (INFO_GTE(SYMSAFE, 1))
-				rprintf(FINFO, "not backing up symlink with unreadable target \"%s\"\n", fname);
-			ret = 2;
-			goto success;
-		}
-		lnkbuf[llen] = '\0';
-		if (unsafe_symlink(lnkbuf, fname)) {
-			if (INFO_GTE(SYMSAFE, 1)) {
-				rprintf(FINFO, "not backing up unsafe symlink \"%s\" -> \"%s\"\n",
-					fname, lnkbuf);
-			}
-			ret = 2;
-			goto success;
-		}
-	}
+	/* return if no file to keep */
+	if (x_lstat(fname, &sx.st, NULL) < 0)
+		return 1;
+#ifdef SUPPORT_ACLS
+	sx.acc_acl = sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+	sx.xattr = NULL;
 #endif

-	/* Try a hard-link or a rename first.  Using rename is not atomic, but
-	 * is more efficient than forcing a copy for larger files when no hard-
-	 * linking is possible. */
-	if ((ret = link_or_rename(fname, buf, prefer_rename, &sx.st)) != 0)
-		goto success;
-	if (errno == EEXIST || errno == EISDIR) {
-		STRUCT_STAT bakst;
-		if (vfs_lstat(VFS_AT_FDCWD, buf, &bakst, VFS_OPERATOR_PATH) == 0) {
-			int flags = get_del_for_flag(bakst.st_mode) | DEL_FOR_BACKUP | DEL_RECURSE;
-			if (delete_item(buf, bakst.st_mode, flags) != 0)
-				return 0;
-		}
-		if ((ret = link_or_rename(fname, buf, prefer_rename, &sx.st)) != 0)
-			goto success;
+	if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
+		return 1; /* the file could have disappeared */
+
+	if (!(buf = get_backup_name(fname))) {
+		unmake_file(file);
+		return 0;
 	}

-	/* Fall back to making a copy. */
-	if (!(file = make_file(fname, NULL, &sx.st, 0, NO_FILTERS)))
-		return 3; /* the file could have disappeared */
-
-#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
-	{	/* read the source file's ACL/xattr through a confined fd */
-	int bfd = backup_source_fd(fname);
-	if (!backup_metadata_hardened() || bfd >= 0) {
-# ifdef SUPPORT_ACLS
-		if (preserve_acls && !S_ISLNK(file->mode)) {
-			get_acl_fdat(bfd, -1, NULL, fname, &sx);
-			cache_tmp_acl(file, &sx);
-			free_acl(&sx);
-		}
-# endif
-# ifdef SUPPORT_XATTRS
-		if (preserve_xattrs) {
-			get_xattr(fname, bfd, &sx);
-			cache_tmp_xattr(file, &sx);
-			free_xattr(&sx);
-		}
-# endif
+#ifdef SUPPORT_ACLS
+	if (preserve_acls && !S_ISLNK(file->mode)) {
+		get_acl(fname, &sx);
+		cache_acl(file, &sx);
+		free_acl(&sx);
 	}
-	if (bfd >= 0)
-		close(bfd);
+#endif
+#ifdef SUPPORT_XATTRS
+	if (preserve_xattrs) {
+		get_xattr(fname, &sx);
+		cache_xattr(file, &sx);
+		free_xattr(&sx);
 	}
 #endif

 	/* Check to see if this is a device file, or link */
 	if ((am_root && preserve_devices && IS_DEVICE(file->mode))
 	 || (preserve_specials && IS_SPECIAL(file->mode))) {
-		if (vfs_mknod(VFS_AT_FDCWD, buf, file->mode, sx.st.st_rdev, VFS_OPERATOR_PATH) < 0)
-			rsyserr(FERROR, errno, "mknod %s failed", full_fname(buf));
-		else if (DEBUG_GTE(BACKUP, 1))
-			rprintf(FINFO, "make_backup: DEVICE %s successful.\n", fname);
-		ret = 2;
+		int save_errno;
+		do_unlink(buf);
+		if (do_mknod(buf, file->mode, sx.st.st_rdev) < 0) {
+			save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+			if (errno == ENOENT && make_bak_dir(buf) == 0) {
+				if (do_mknod(buf, file->mode, sx.st.st_rdev) < 0)
+					save_errno = errno ? errno : save_errno;
+				else
+					save_errno = 0;
+			}
+			if (save_errno) {
+				rsyserr(FERROR, save_errno, "mknod %s failed",
+					full_fname(buf));
+			}
+		} else
+			save_errno = 0;
+		if (verbose > 2 && save_errno == 0) {
+			rprintf(FINFO, "make_backup: DEVICE %s successful.\n",
+				fname);
+		}
+		kept = 1;
+		do_unlink(fname);
+	}
+
+	if (!kept && S_ISDIR(file->mode)) {
+		/* make an empty directory */
+		if (do_mkdir(buf, file->mode) < 0) {
+			int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+			if (errno == ENOENT && make_bak_dir(buf) == 0) {
+				if (do_mkdir(buf, file->mode) < 0)
+					save_errno = errno ? errno : save_errno;
+				else
+					save_errno = 0;
+			}
+			if (save_errno) {
+				rsyserr(FINFO, save_errno, "mkdir %s failed",
+					full_fname(buf));
+			}
+		}
+
+		ret_code = do_rmdir(fname);
+		if (verbose > 2) {
+			rprintf(FINFO, "make_backup: RMDIR %s returns %i\n",
+				full_fname(fname), ret_code);
+		}
+		kept = 1;
 	}

 #ifdef SUPPORT_LINKS
-	if (!ret && preserve_links && S_ISLNK(file->mode)) {
+	if (!kept && preserve_links && S_ISLNK(file->mode)) {
 		const char *sl = F_SYMLINK(file);
-		if (safe_symlinks && unsafe_symlink(sl, fname)) {
-			if (INFO_GTE(SYMSAFE, 1)) {
-				rprintf(FINFO, "not backing up unsafe symlink \"%s\" -> \"%s\"\n",
-					fname, sl);
+		if (safe_symlinks && unsafe_symlink(sl, buf)) {
+			if (verbose) {
+				rprintf(FINFO, "ignoring unsafe symlink %s -> %s\n",
+					full_fname(buf), sl);
 			}
-			ret = 2;
+			kept = 1;
 		} else {
-			if (vfs_symlink(sl, VFS_AT_FDCWD, buf, VFS_OPERATOR_PATH) < 0)
-				rsyserr(FERROR, errno, "link %s -> \"%s\"", full_fname(buf), sl);
-			else if (DEBUG_GTE(BACKUP, 1))
-				rprintf(FINFO, "make_backup: SYMLINK %s successful.\n", fname);
-			ret = 2;
+			do_unlink(buf);
+			if (do_symlink(sl, buf) < 0) {
+				int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+				if (errno == ENOENT && make_bak_dir(buf) == 0) {
+					if (do_symlink(sl, buf) < 0)
+						save_errno = errno ? errno : save_errno;
+					else
+						save_errno = 0;
+				}
+				if (save_errno) {
+					rsyserr(FERROR, save_errno, "link %s -> \"%s\"",
+						full_fname(buf), sl);
+				}
+			}
+			do_unlink(fname);
+			kept = 1;
 		}
 	}
 #endif

-	if (!ret && !S_ISREG(file->mode)) {
-		if (INFO_GTE(NONREG, 1))
-			rprintf(FINFO, "make_bak: skipping non-regular file %s\n", fname);
+	if (!kept && !S_ISREG(file->mode)) {
+		rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
+			fname);
 		unmake_file(file);
-#ifdef SUPPORT_ACLS
-		uncache_tmp_acls();
-#endif
-#ifdef SUPPORT_XATTRS
-		uncache_tmp_xattrs();
-#endif
-		return 3;
+		return 1;
 	}

-	/* Copy to backup tree if a file. */
-	if (!ret) {
-		if (copy_file(fname, buf, -1, file->mode, VFS_OPERATOR_PATH) < 0) {
+	/* move to keep tree if a file */
+	if (!kept) {
+		if (robust_move(fname, buf) != 0) {
 			rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
 				full_fname(fname), buf);
-			unmake_file(file);
-#ifdef SUPPORT_ACLS
-			uncache_tmp_acls();
-#endif
-#ifdef SUPPORT_XATTRS
-			uncache_tmp_xattrs();
-#endif
-			return 0;
+		} else if (sx.st.st_nlink > 1) {
+			/* If someone has hard-linked the file into the backup
+			 * dir, rename() might return success but do nothing! */
+			robust_unlink(fname); /* Just in case... */
 		}
-		if (DEBUG_GTE(BACKUP, 1))
-			rprintf(FINFO, "make_backup: COPY %s successful.\n", fname);
-		ret = 2;
 	}
-
-	save_preserve_xattrs = preserve_xattrs;
 	preserve_xattrs = 0;
-	set_file_attrs(buf, file, NULL, fname, ATTRS_OPERATOR_PATH | ATTRS_ACCURATE_TIME);
+	set_file_attrs(buf, file, NULL, fname, 0);
 	preserve_xattrs = save_preserve_xattrs;
-
 	unmake_file(file);
-#ifdef SUPPORT_ACLS
-	uncache_tmp_acls();
-#endif
-#ifdef SUPPORT_XATTRS
-	uncache_tmp_xattrs();
-#endif

-  success:
-	if (INFO_GTE(BACKUP, 1))
-		rprintf(FINFO, "backed up %s to %s\n", fname, buf);
-	return ret;
+	if (verbose > 1) {
+		rprintf(FINFO, "backed up %s to %s\n",
+			fname, buf);
+	}
+	return 1;
 }

-int make_backup(const char *fname, BOOL prefer_rename)
+
+/* main backup switch routine */
+int make_backup(const char *fname)
 {
-	int ret;
-	/* The --backup-dir is an operator-supplied path: resolve it (and the
-	 * tail/rename beneath it) with the ownership walk so a foreign-owned
-	 * symlink component is refused while the operator's own is followed --
-	 * absolute and relative alike.  --insecure-links / "insecure links ="
-	 * restores legacy following. */
-	ret = make_backup_inner(fname, prefer_rename);
-	return ret;
+	if (backup_dir)
+		return keep_backup(fname);
+	return make_simple_backup(fname);
 }
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 1999 Weiss
 * Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004-2022 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 */

 #include "rsync.h"
-#include <zlib.h>
+#include "zlib/zlib.h"
 #include <time.h>

 extern int eol_nulls;
@@ -37,19 +37,14 @@ extern int always_checksum;
 extern int do_compression;
 extern int inplace;
 extern int append_mode;
-extern int write_batch;
 extern int protocol_version;
-extern int raw_argc, cooked_argc;
-extern char **raw_argv, **cooked_argv;
 extern char *batch_name;
 #ifdef ICONV_OPTION
 extern char *iconv_opt;
 #endif

-extern filter_rule_list filter_list;
+extern struct filter_list_struct filter_list;

-int batch_fd = -1;
-int batch_sh_fd = -1;
 int batch_stream_flags;

 static int tweaked_append;
@@ -75,7 +70,7 @@ static int *flag_ptr[] = {
 	NULL
 };

-static const char *const flag_name[] = {
+static char *flag_name[] = {
 	"--recurse (-r)",
 	"--owner (-o)",
 	"--group (-g)",
@@ -140,7 +135,7 @@ void check_batch_flags(void)
 					set ? "Please" : "Do not");
 				exit_cleanup(RERR_SYNTAX);
 			}
-			if (INFO_GTE(MISC, 1)) {
+			if (verbose) {
 				rprintf(FINFO,
 					"%sing the %s option to match the batchfile.\n",
 					set ? "Sett" : "Clear", flag_name[i]);
@@ -161,76 +156,50 @@ void check_batch_flags(void)
 		append_mode = 2;
 }

-static int write_arg(const char *arg)
+static int write_arg(int fd, char *arg)
 {
-	const char *x, *s;
-	int len, err = 0;
+	char *x, *s;
+	int len, ret = 0;

-	/* Emit a "--opt=" prefix unquoted only when it is a plain option token;
-	 * a metacharacter before '=' (an attacker-shaped arg) must be quoted
-	 * along with the rest, or it would run raw in the replay script. */
 	if (*arg == '-' && (x = strchr(arg, '=')) != NULL) {
-		const char *p = arg;
-		while (p < x && (*p == '-' || *p == '_'
-		    || (*p >= '0' && *p <= '9')
-		    || (*p >= 'A' && *p <= 'Z')
-		    || (*p >= 'a' && *p <= 'z')))
-			p++;
-		if (p == x) {
-			err |= write(batch_sh_fd, arg, x - arg + 1) != x - arg + 1;
-			arg += x - arg + 1;
+		if (write(fd, arg, x - arg + 1) != x - arg + 1)
+			ret = -1;
+		arg += x - arg + 1;
+	}
+
+	if (strpbrk(arg, " \"'&;|[]()$#!*?^\\") != NULL) {
+		if (write(fd, "'", 1) != 1)
+			ret = -1;
+		for (s = arg; (x = strchr(s, '\'')) != NULL; s = x + 1) {
+			if (write(fd, s, x - s + 1) != x - s + 1
+			 || write(fd, "'", 1) != 1)
+				ret = -1;
 		}
+		len = strlen(s);
+		if (write(fd, s, len) != len
+		 || write(fd, "'", 1) != 1)
+			ret = -1;
+		return ret;
 	}

-	/* Single-quote unconditionally so every shell metacharacter (backtick,
-	 * newline, redirection, ...) stays literal in the replay script. An
-	 * embedded ' is emitted as the '\'' close/escape/reopen sequence. */
-	err |= write(batch_sh_fd, "'", 1) != 1;
-	for (s = arg; (x = strchr(s, '\'')) != NULL; s = x + 1) {
-		err |= write(batch_sh_fd, s, x - s) != x - s;
-		err |= write(batch_sh_fd, "'\\''", 4) != 4;
-	}
-	len = strlen(s);
-	err |= write(batch_sh_fd, s, len) != len;
-	err |= write(batch_sh_fd, "'", 1) != 1;
+	len = strlen(arg);
+	if (write(fd, arg, len) != len)
+		ret = -1;

-	return err;
-}
-
-/* Writes out a space and then an option (or other string) with an optional "=" + arg suffix. */
-static int write_opt(const char *opt, const char *arg)
-{
-	int len = strlen(opt);
-	int err = write(batch_sh_fd, " ", 1) != 1;
-	err |= write(batch_sh_fd, opt, len) != len;
-	if (arg) {
-		err |= write(batch_sh_fd, "=", 1) != 1;
-		err |= write_arg(arg);
-	}
-	return err;
+	return ret;
 }

 static void write_filter_rules(int fd)
 {
-	filter_rule *ent;
+	struct filter_struct *ent;

 	write_sbuf(fd, " <<'#E#'\n");
 	for (ent = filter_list.head; ent; ent = ent->next) {
 		unsigned int plen;
-		char *p = get_rule_prefix(ent, "- ", 0, &plen);
-		/* A filter pattern is one here-doc line; an embedded newline would let
-		 * a crafted pattern (e.g. from a dir-merge/--exclude-from file in an
-		 * untrusted tree) forge the "#E#" terminator on its own line and inject
-		 * shell commands into the generated replay script.  Such a pattern also
-		 * can't round-trip the line-delimited here-doc, so refuse it fail-closed
-		 * rather than emit an injectable script. */
-		if (ent->pattern && strchr(ent->pattern, '\n')) {
-			rprintf(FERROR, "cannot write a filter rule containing a newline to the batch replay script\n");
-			exit_cleanup(RERR_SYNTAX);
-		}
+		char *p = get_rule_prefix(ent->match_flags, "- ", 0, &plen);
 		write_buf(fd, p, plen);
 		write_sbuf(fd, ent->pattern);
-		if (ent->rflags & FILTRULE_DIRECTORY)
+		if (ent->match_flags & MATCHFLG_DIRECTORY)
 			write_byte(fd, '/');
 		write_byte(fd, eol_nulls ? 0 : '\n');
 	}
@@ -239,84 +208,41 @@ static void write_filter_rules(int fd)
 	write_sbuf(fd, "#E#");
 }

-/* This sets batch_fd and (for --write-batch) batch_sh_fd. */
-void open_batch_files(void)
-{
-	/* --write-batch/--read-batch are operator-supplied; a planted symlink
-	 * could truncate+overwrite an arbitrary file (write side) or stream
-	 * attacker bytes into the protocol parser (read side).  Refuse symlinks
-	 * not owned by uid 0 or our euid anywhere in the path. */
-	if (write_batch) {
-		char filename[MAXPATHLEN];
-
-		stringjoin(filename, sizeof filename, batch_name, ".sh", NULL);
-
-		batch_sh_fd = vfs_open_owner_walk(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR | S_IXUSR, 0);
-		if (batch_sh_fd < 0) {
-			rsyserr(FERROR, errno, "Batch file %s open error", full_fname(filename));
-			exit_cleanup(RERR_FILESELECT);
-		}
-
-		/* O_BINARY: the batch stream is binary protocol data; without it
-		 * Cygwin et al apply CRLF translation and corrupt it.  Unlike
-		 * vfs_open(), vfs_open_owner_walk passes flags verbatim. */
-		batch_fd = vfs_open_owner_walk(batch_name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR, 0);
-	} else if (strcmp(batch_name, "-") == 0)
-		batch_fd = STDIN_FILENO;
-	else
-		batch_fd = vfs_open_owner_walk(batch_name, O_RDONLY | O_BINARY, S_IRUSR | S_IWUSR, 0);
-
-	if (batch_fd < 0) {
-		rsyserr(FERROR, errno, "Batch file %s open error", full_fname(batch_name));
-		exit_cleanup(RERR_FILEIO);
-	}
-
-	/* --read-batch: the file's bytes drive the protocol parser, so refuse
-	 * non-regular files (FIFO, device, socket) at the batch path. */
-	if (!write_batch && batch_fd != STDIN_FILENO) {
-		STRUCT_STAT st;
-		if (vfs_fstat(batch_fd, &st) == 0 && !S_ISREG(st.st_mode)) {
-			rprintf(FERROR, "Batch file %s is not a regular file\n",
-				full_fname(batch_name));
-			exit_cleanup(RERR_FILEIO);
-		}
-	}
-}
-
 /* This routine tries to write out an equivalent --read-batch command
 * given the user's --write-batch args.  However, it doesn't really
 * understand most of the options, so it uses some overly simple
 * heuristics to munge the command line into something that will
 * (hopefully) work. */
-void write_batch_shell_file(void)
+void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 {
-	int i, j, len, err = 0;
-	char *p, *p2;
+	int fd, i, len, err = 0;
+	char *p, filename[MAXPATHLEN];
+
+	stringjoin(filename, sizeof filename,
+		   batch_name, ".sh", NULL);
+	fd = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
+		     S_IRUSR | S_IWUSR | S_IEXEC);
+	if (fd < 0) {
+		rsyserr(FERROR, errno, "Batch file %s open error",
+			filename);
+		exit_cleanup(RERR_FILESELECT);
+	}

 	/* Write argvs info to BATCH.sh file */
-	err |= write_arg(raw_argv[0]);
+	if (write_arg(fd, argv[0]) < 0)
+		err = 1;
 	if (filter_list.head) {
 		if (protocol_version >= 29)
-			err |= write_opt("--filter", "._-");
+			write_sbuf(fd, " --filter=._-");
 		else
-			err |= write_opt("--exclude-from", "-");
+			write_sbuf(fd, " --exclude-from=-");
 	}
-
-	/* Elide the filename args from the option list, but scan for them in reverse. */
-	for (i = raw_argc-1, j = cooked_argc-1; i > 0 && j >= 0; i--) {
-		if (strcmp(raw_argv[i], cooked_argv[j]) == 0) {
-			raw_argv[i] = NULL;
-			j--;
-		}
-	}
-
-	for (i = 1; i < raw_argc; i++) {
-		if (!(p = raw_argv[i]))
-			continue;
+	for (i = 1; i < argc - file_arg_cnt; i++) {
+		p = argv[i];
 		if (strncmp(p, "--files-from", 12) == 0
-		 || strncmp(p, "--filter", 8) == 0
-		 || strncmp(p, "--include", 9) == 0
-		 || strncmp(p, "--exclude", 9) == 0) {
+		    || strncmp(p, "--filter", 8) == 0
+		    || strncmp(p, "--include", 9) == 0
+		    || strncmp(p, "--exclude", 9) == 0) {
 			if (strchr(p, '=') == NULL)
 				i++;
 			continue;
@@ -325,24 +251,33 @@ void write_batch_shell_file(void)
 			i++;
 			continue;
 		}
+		if (write(fd, " ", 1) != 1)
+			err = 1;
 		if (strncmp(p, "--write-batch", len = 13) == 0
-		 || strncmp(p, "--only-write-batch", len = 18) == 0)
-			err |= write_opt("--read-batch", p[len] == '=' ? p + len + 1 : NULL);
-		else {
-			err |= write(batch_sh_fd, " ", 1) != 1;
-			err |= write_arg(p);
+		 || strncmp(p, "--only-write-batch", len = 18) == 0) {
+			if (write(fd, "--read-batch", 12) != 12)
+				err = 1;
+			if (p[len] == '=') {
+				if (write(fd, "=", 1) != 1
+				 || write_arg(fd, p + len + 1) < 0)
+					err = 1;
+			}
+		} else {
+			if (write_arg(fd, p) < 0)
+				err = 1;
 		}
 	}
-	if (!(p = check_for_hostspec(cooked_argv[cooked_argc - 1], &p2, &i)))
-		p = cooked_argv[cooked_argc - 1];
-	err |= write_opt("${1:-", NULL);
-	err |= write_arg(p);
-	err |= write(batch_sh_fd, "}", 1) != 1;
+	if (!(p = check_for_hostspec(argv[argc - 1], &p, &i)))
+		p = argv[argc - 1];
+	if (write(fd, " ${1:-", 6) != 6
+	 || write_arg(fd, p) < 0)
+		err = 1;
+	write_byte(fd, '}');
 	if (filter_list.head)
-		write_filter_rules(batch_sh_fd);
-	if (write(batch_sh_fd, "\n", 1) != 1 || close(batch_sh_fd) < 0 || err) {
-		rsyserr(FERROR, errno, "Batch file %s.sh write error", batch_name);
+		write_filter_rules(fd);
+	if (write(fd, "\n", 1) != 1 || close(fd) < 0 || err) {
+		rsyserr(FERROR, errno, "Batch file %s write error",
+			filename);
 		exit_cleanup(RERR_FILEIO);
 	}
-	batch_sh_fd = -1;
 }
@@ -2,7 +2,7 @@
 * Simple byteorder handling.
 *
 * Copyright (C) 1992-1995 Andrew Tridgell
- * Copyright (C) 2007-2022 Wayne Davison
+ * Copyright (C) 2007-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@

 /* We know that the x86 can handle misalignment and has the same
 * byte order (LSB-first) as the 32-bit numbers we transmit. */
-#if defined __i386__ || defined __i486__ || defined __i586__ || defined __i686__ || __amd64
+#ifdef __i386__
 #define CAREFUL_ALIGNMENT 0
 #endif

@@ -32,131 +32,21 @@

 #define CVAL(buf,pos) (((unsigned char *)(buf))[pos])
 #define UVAL(buf,pos) ((uint32)CVAL(buf,pos))
+#define SCVAL(buf,pos,val) (CVAL(buf,pos) = (val))

 #if CAREFUL_ALIGNMENT
-
-static inline uint32
-IVALu(const uchar *buf, int pos)
-{
-	return UVAL(buf, pos)
-	     | UVAL(buf, pos + 1) << 8
-	     | UVAL(buf, pos + 2) << 16
-	     | UVAL(buf, pos + 3) << 24;
-}
-
-static inline void
-SIVALu(uchar *buf, int pos, uint32 val)
-{
-	CVAL(buf, pos)     = val;
-	CVAL(buf, pos + 1) = val >> 8;
-	CVAL(buf, pos + 2) = val >> 16;
-	CVAL(buf, pos + 3) = val >> 24;
-}
-
-static inline int64
-IVAL64(const char *buf, int pos)
-{
-	return IVALu((uchar*)buf, pos) | (int64)IVALu((uchar*)buf, pos + 4) << 32;
-}
-
-static inline void
-SIVAL64(char *buf, int pos, int64 val)
-{
-	SIVALu((uchar*)buf, pos, val);
-	SIVALu((uchar*)buf, pos + 4, val >> 32);
-}
-
-#else /* !CAREFUL_ALIGNMENT */
-
-/* We don't want false positives about alignment from UBSAN, see:
-   https://github.com/WayneD/rsync/issues/427#issuecomment-1375132291
+#define PVAL(buf,pos) (UVAL(buf,pos)|UVAL(buf,(pos)+1)<<8)
+#define IVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+2)<<16)
+#define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8)
+#define SIVALX(buf,pos,val) (SSVALX(buf,pos,val&0xFFFF),SSVALX(buf,pos+2,val>>16))
+#define SIVAL(buf,pos,val) SIVALX((buf),(pos),((uint32)(val)))
+#else
+/* this handles things for architectures like the 386 that can handle
+   alignment errors */
+/*
+   WARNING: This section is dependent on the length of int32
+   being correct. set CAREFUL_ALIGNMENT if it is not.
 */
-
-/* From https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html */
-#ifndef GCC_VERSION
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
+#define IVAL(buf,pos) (*(uint32 *)((char *)(buf) + (pos)))
+#define SIVAL(buf,pos,val) IVAL(buf,pos)=((uint32)(val))
 #endif
-
-/* This handles things for architectures like the 386 that can handle alignment errors.
- * WARNING: This section is dependent on the length of an int32 (and thus a uint32)
- * being correct (4 bytes)!  Set CAREFUL_ALIGNMENT if it is not. */
-
-#ifdef __clang__
-__attribute__((no_sanitize("undefined")))
-#elif GCC_VERSION >= 409
-__attribute__((no_sanitize_undefined))
-#endif
-static inline uint32
-IVALu(const uchar *buf, int pos)
-{
-	union {
-		const uchar *b;
-		const uint32 *num;
-	} u;
-	u.b = buf + pos;
-	return *u.num;
-}
-
-#ifdef __clang__
-__attribute__((no_sanitize("undefined")))
-#elif GCC_VERSION >= 409
-__attribute__((no_sanitize_undefined))
-#endif
-static inline void
-SIVALu(uchar *buf, int pos, uint32 val)
-{
-	union {
-		uchar *b;
-		uint32 *num;
-	} u;
-	u.b = buf + pos;
-	*u.num = val;
-}
-
-#ifdef __clang__
-__attribute__((no_sanitize("undefined")))
-#elif GCC_VERSION >= 409
-__attribute__((no_sanitize_undefined))
-#endif
-static inline int64
-IVAL64(const char *buf, int pos)
-{
-	union {
-		const char *b;
-		const int64 *num;
-	} u;
-	u.b = buf + pos;
-	return *u.num;
-}
-
-#ifdef __clang__
-__attribute__((no_sanitize("undefined")))
-#elif GCC_VERSION >= 409
-__attribute__((no_sanitize_undefined))
-#endif
-static inline void
-SIVAL64(char *buf, int pos, int64 val)
-{
-	union {
-		char *b;
-		int64 *num;
-	} u;
-	u.b = buf + pos;
-	*u.num = val;
-}
-
-#endif /* !CAREFUL_ALIGNMENT */
-
-static inline uint32
-IVAL(const char *buf, int pos)
-{
-	return IVALu((uchar*)buf, pos);
-}
-
-static inline void
-SIVAL(char *buf, int pos, uint32 val)
-{
-	SIVALu((uchar*)buf, pos, val);
-}
@@ -1,7 +1,7 @@
 /*
- * Allow an arbitrary sequence of case labels.
+ * End-of-run cleanup helper code used by cleanup.c.
 *
- * Copyright (C) 2006-2020 Wayne Davison
+ * Copyright (C) 2006-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,76 +17,63 @@
 * with this program; if not, visit the http://fsf.org website.
 */

-/* This is included multiple times, once for every segment in a switch statement.
- * This produces the next "case N:" statement in sequence. */
+/* This is included by cleanup.c multiple times, once for every segement in
+ * the _exit_cleanup() code.  This produces the next "case N:" statement in
+ * sequence and increments the cleanup_step variable by 1.  This ensures that
+ * our case statements never get out of whack due to added/removed steps. */

-#if !defined CASE_N_STATE_0
-#define CASE_N_STATE_0
+#if !defined EXIT_CLEANUP_CASE_0
+#define EXIT_CLEANUP_CASE_0
 	case 0:
-#elif !defined CASE_N_STATE_1
-#define CASE_N_STATE_1
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_1
+#define EXIT_CLEANUP_CASE_1
 	case 1:
-#elif !defined CASE_N_STATE_2
-#define CASE_N_STATE_2
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_2
+#define EXIT_CLEANUP_CASE_2
 	case 2:
-#elif !defined CASE_N_STATE_3
-#define CASE_N_STATE_3
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_3
+#define EXIT_CLEANUP_CASE_3
 	case 3:
-#elif !defined CASE_N_STATE_4
-#define CASE_N_STATE_4
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_4
+#define EXIT_CLEANUP_CASE_4
 	case 4:
-#elif !defined CASE_N_STATE_5
-#define CASE_N_STATE_5
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_5
+#define EXIT_CLEANUP_CASE_5
 	case 5:
-#elif !defined CASE_N_STATE_6
-#define CASE_N_STATE_6
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_6
+#define EXIT_CLEANUP_CASE_6
 	case 6:
-#elif !defined CASE_N_STATE_7
-#define CASE_N_STATE_7
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_7
+#define EXIT_CLEANUP_CASE_7
 	case 7:
-#elif !defined CASE_N_STATE_8
-#define CASE_N_STATE_8
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_8
+#define EXIT_CLEANUP_CASE_8
 	case 8:
-#elif !defined CASE_N_STATE_9
-#define CASE_N_STATE_9
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_9
+#define EXIT_CLEANUP_CASE_9
 	case 9:
-#elif !defined CASE_N_STATE_10
-#define CASE_N_STATE_10
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_10
+#define EXIT_CLEANUP_CASE_10
 	case 10:
-#elif !defined CASE_N_STATE_11
-#define CASE_N_STATE_11
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_11
+#define EXIT_CLEANUP_CASE_11
 	case 11:
-#elif !defined CASE_N_STATE_12
-#define CASE_N_STATE_12
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_12
+#define EXIT_CLEANUP_CASE_12
 	case 12:
-#elif !defined CASE_N_STATE_13
-#define CASE_N_STATE_13
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_13
+#define EXIT_CLEANUP_CASE_13
 	case 13:
-#elif !defined CASE_N_STATE_14
-#define CASE_N_STATE_14
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_14
+#define EXIT_CLEANUP_CASE_14
 	case 14:
-#elif !defined CASE_N_STATE_15
-#define CASE_N_STATE_15
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_15
+#define EXIT_CLEANUP_CASE_15
 	case 15:
-#elif !defined CASE_N_STATE_16
-#define CASE_N_STATE_16
-	/* FALLTHROUGH */
+#elif !defined EXIT_CLEANUP_CASE_16
+#define EXIT_CLEANUP_CASE_16
 	case 16:
 #else
 #error Need to add more case statements!
 #endif
+		cleanup_step++;
@@ -3,20 +3,13 @@
 *
 * Copyright (C) 1996 Andrew Tridgell
 * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-2023 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * 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.
 *
- * In addition, as a special exception, the copyright holders give
- * permission to dynamically link rsync with the OpenSSL and xxhash
- * libraries when those libraries are being distributed in compliance
- * with their license terms, and to distribute a dynamically linked
- * combination of rsync and these libraries.  This is also considered
- * to be covered under the GPL's System Libraries exception.
- *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -28,366 +21,61 @@

 #include "rsync.h"

-#ifdef SUPPORT_XXHASH
-#include <xxhash.h>
-# if XXH_VERSION_NUMBER >= 800
-#  define SUPPORT_XXH3 1
-# endif
-#endif
-
-extern int am_server;
-extern int whole_file;
 extern int checksum_seed;
 extern int protocol_version;
-extern int proper_seed_order;
-extern const char *checksum_choice;

-#define NNI_BUILTIN (1<<0)
-#define NNI_EVP (1<<1)
-#define NNI_EVP_OK (1<<2)
+int csum_length = SHORT_SUM_LENGTH; /* initial value */

-struct name_num_item valid_checksums_items[] = {
-#ifdef SUPPORT_XXH3
-	{ CSUM_XXH3_128, 0, "xxh128", NULL },
-	{ CSUM_XXH3_64, 0, "xxh3", NULL },
-#endif
-#ifdef SUPPORT_XXHASH
-	{ CSUM_XXH64, 0, "xxh64", NULL },
-	{ CSUM_XXH64, 0, "xxhash", NULL },
-#endif
-	{ CSUM_MD5, NNI_BUILTIN|NNI_EVP, "md5", NULL },
-	{ CSUM_MD4, NNI_BUILTIN|NNI_EVP, "md4", NULL },
-#ifdef SHA_DIGEST_LENGTH
-	{ CSUM_SHA1, NNI_EVP, "sha1", NULL },
-#endif
-	{ CSUM_NONE, 0, "none", NULL },
-	{ 0, 0, NULL, NULL }
-};
-
-struct name_num_obj valid_checksums = {
-	"checksum", NULL, 0, 0, valid_checksums_items
-};
-
-struct name_num_item valid_auth_checksums_items[] = {
-#ifdef SHA512_DIGEST_LENGTH
-	{ CSUM_SHA512, NNI_EVP, "sha512", NULL },
-#endif
-#ifdef SHA256_DIGEST_LENGTH
-	{ CSUM_SHA256, NNI_EVP, "sha256", NULL },
-#endif
-#ifdef SHA_DIGEST_LENGTH
-	{ CSUM_SHA1, NNI_EVP, "sha1", NULL },
-#endif
-	{ CSUM_MD5, NNI_BUILTIN|NNI_EVP, "md5", NULL },
-	{ CSUM_MD4, NNI_BUILTIN|NNI_EVP, "md4", NULL },
-	{ 0, 0, NULL, NULL }
-};
-
-struct name_num_obj valid_auth_checksums = {
-	"daemon auth checksum", NULL, 0, 0, valid_auth_checksums_items
-};
-
-/* Return the strength rank (0 = strongest) of a daemon-auth digest by name in
- * valid_auth_checksums_items[], which is listed strongest-first; -1 if the name
- * is not a supported auth digest on this build.  Used by the daemon's
- * "auth digest" floor to compare the negotiated digest against the minimum. */
-int auth_digest_rank(const char *name)
-{
-	struct name_num_item *nni;
-	int rank = 0;
-
-	if (!name || !*name)
-		return -1;
-	for (nni = valid_auth_checksums_items; nni->name; nni++, rank++) {
-		if (strcasecmp(nni->name, name) == 0)
-			return rank;
-	}
-	return -1;
-}
-
-/* These cannot make use of openssl, so they're marked just as built-in */
-struct name_num_item implied_checksum_md4 =
-    { CSUM_MD4, NNI_BUILTIN, "md4", NULL };
-struct name_num_item implied_checksum_md5 =
-    { CSUM_MD5, NNI_BUILTIN, "md5", NULL };
-
-struct name_num_item *xfer_sum_nni; /* used for the transfer checksum2 computations */
-int xfer_sum_len;
-struct name_num_item *file_sum_nni; /* used for the pre-transfer --checksum computations */
-int file_sum_len, file_sum_extra_cnt;
-
-#ifdef USE_OPENSSL
-const EVP_MD *xfer_sum_evp_md;
-const EVP_MD *file_sum_evp_md;
-EVP_MD_CTX *ctx_evp = NULL;
-#endif
-
-static int initialized_choices = 0;
-
-struct name_num_item *parse_csum_name(const char *name, int len)
-{
-	struct name_num_item *nni;
-
-	if (len < 0 && name)
-		len = strlen(name);
-
-	init_checksum_choices();
-
-	if (!name || (len == 4 && strncasecmp(name, "auto", 4) == 0)) {
-		if (protocol_version >= 30) {
-			if (!proper_seed_order)
-				return &implied_checksum_md5;
-			name = "md5";
-			len = 3;
-		} else {
-			if (protocol_version >= 27)
-				implied_checksum_md4.num = CSUM_MD4_OLD;
-			else if (protocol_version >= 21)
-				implied_checksum_md4.num = CSUM_MD4_BUSTED;
-			else
-				implied_checksum_md4.num = CSUM_MD4_ARCHAIC;
-			return &implied_checksum_md4;
-		}
-	}
-
-	nni = get_nni_by_name(&valid_checksums, name, len);
-
-	if (!nni) {
-		rprintf(FERROR, "unknown checksum name: %s\n", name);
-		exit_cleanup(RERR_UNSUPPORTED);
-	}
-
-	return nni;
-}
-
-#ifdef USE_OPENSSL
-static const EVP_MD *csum_evp_md(struct name_num_item *nni)
-{
-	const EVP_MD *emd;
-	if (!(nni->flags & NNI_EVP))
-		return NULL;
-
-#ifdef USE_MD5_ASM
-	if (nni->num == CSUM_MD5)
-		emd = NULL;
-	else
-#endif
-		emd = EVP_get_digestbyname(nni->name);
-	if (emd && !(nni->flags & NNI_EVP_OK)) { /* Make sure it works before we advertise it */
-		if (!ctx_evp && !(ctx_evp = EVP_MD_CTX_create()))
-			out_of_memory("csum_evp_md");
-		/* Some routines are marked as legacy and are not enabled in the openssl.cnf file.
-		 * If we can't init the emd, we'll fall back to our built-in code. */
-		if (EVP_DigestInit_ex(ctx_evp, emd, NULL) == 0)
-			emd = NULL;
-		else
-			nni->flags = (nni->flags & ~NNI_BUILTIN) | NNI_EVP_OK;
-	}
-	if (!emd)
-		nni->flags &= ~NNI_EVP;
-	return emd;
-}
-#endif
-
-void parse_checksum_choice(int final_call)
-{
-	if (valid_checksums.negotiated_nni)
-		xfer_sum_nni = file_sum_nni = valid_checksums.negotiated_nni;
-	else {
-		const char *cp = checksum_choice ? strchr(checksum_choice, ',') : NULL;
-		if (cp) {
-			xfer_sum_nni = parse_csum_name(checksum_choice, cp - checksum_choice);
-			file_sum_nni = parse_csum_name(cp+1, -1);
-		} else
-			xfer_sum_nni = file_sum_nni = parse_csum_name(checksum_choice, -1);
-		if (am_server && checksum_choice)
-			validate_choice_vs_env(NSTR_CHECKSUM, xfer_sum_nni->num, file_sum_nni->num);
-	}
-	xfer_sum_len = csum_len_for_type(xfer_sum_nni->num, 0);
-	file_sum_len = csum_len_for_type(file_sum_nni->num, 0);
-#ifdef USE_OPENSSL
-	xfer_sum_evp_md = csum_evp_md(xfer_sum_nni);
-	file_sum_evp_md = csum_evp_md(file_sum_nni);
-#endif
-
-	file_sum_extra_cnt = (file_sum_len + EXTRA_LEN - 1) / EXTRA_LEN;
-
-	if (xfer_sum_nni->num == CSUM_NONE)
-		whole_file = 1;
-
-	/* Snag the checksum name for both write_batch's option output & the following debug output. */
-	if (valid_checksums.negotiated_nni)
-		checksum_choice = valid_checksums.negotiated_nni->name;
-	else if (checksum_choice == NULL)
-		checksum_choice = xfer_sum_nni->name;
-
-	if (final_call && DEBUG_GTE(NSTR, am_server ? 3 : 1)) {
-		rprintf(FINFO, "%s%s checksum: %s\n",
-			am_server ? "Server" : "Client",
-			valid_checksums.negotiated_nni ? " negotiated" : "",
-			checksum_choice);
-	}
-}
-
-int csum_len_for_type(int cst, BOOL flist_csum)
-{
-	switch (cst) {
-	  case CSUM_NONE:
-		return 1;
-	  case CSUM_MD4_ARCHAIC:
-		/* The oldest checksum code is rather weird: the file-list code only sent
-		 * 2-byte checksums, but all other checksums were full MD4 length. */
-		return flist_csum ? 2 : MD4_DIGEST_LEN;
-	  case CSUM_MD4:
-	  case CSUM_MD4_OLD:
-	  case CSUM_MD4_BUSTED:
-		return MD4_DIGEST_LEN;
-	  case CSUM_MD5:
-		return MD5_DIGEST_LEN;
-#ifdef SHA_DIGEST_LENGTH
-	  case CSUM_SHA1:
-		return SHA_DIGEST_LENGTH;
-#endif
-#ifdef SHA256_DIGEST_LENGTH
-	  case CSUM_SHA256:
-		return SHA256_DIGEST_LENGTH;
-#endif
-#ifdef SHA512_DIGEST_LENGTH
-	  case CSUM_SHA512:
-		return SHA512_DIGEST_LENGTH;
-#endif
-	  case CSUM_XXH64:
-	  case CSUM_XXH3_64:
-		return 64/8;
-	  case CSUM_XXH3_128:
-		return 128/8;
-	  default: /* paranoia to prevent missing case values */
-		exit_cleanup(RERR_UNSUPPORTED);
-	}
-	return 0;
-}
-
-/* Returns 0 if the checksum is not canonical (i.e. it includes a seed value).
- * Returns 1 if the public sum order matches our internal sum order.
- * Returns -1 if the public sum order is the reverse of our internal sum order.
- */
-int canonical_checksum(int csum_type)
-{
-	switch (csum_type) {
-	  case CSUM_NONE:
-	  case CSUM_MD4_ARCHAIC:
-	  case CSUM_MD4_OLD:
-	  case CSUM_MD4_BUSTED:
-		break;
-	  case CSUM_MD4:
-	  case CSUM_MD5:
-	  case CSUM_SHA1:
-	  case CSUM_SHA256:
-	  case CSUM_SHA512:
-		return -1;
-	  case CSUM_XXH64:
-	  case CSUM_XXH3_64:
-	  case CSUM_XXH3_128:
-		return 1;
-	  default: /* paranoia to prevent missing case values */
-		exit_cleanup(RERR_UNSUPPORTED);
-	}
-	return 0;
-}
-
-#ifndef USE_ROLL_SIMD /* See simd-checksum-*.cpp. */
 /*
-  a simple 32 bit checksum that can be updated from either end
+  a simple 32 bit checksum that can be upadted from either end
  (inspired by Mark Adler's Adler-32 checksum)
  */
 uint32 get_checksum1(char *buf1, int32 len)
 {
-	int32 i;
-	uint32 s1, s2;
-	schar *buf = (schar *)buf1;
+    int32 i;
+    uint32 s1, s2;
+    schar *buf = (schar *)buf1;

-	s1 = s2 = 0;
-	for (i = 0; i < (len-4); i+=4) {
-		s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3] + 10*CHAR_OFFSET;
-		s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3] + 4*CHAR_OFFSET);
-	}
-	for (; i < len; i++) {
-		s1 += (buf[i]+CHAR_OFFSET); s2 += s1;
-	}
-	return (s1 & 0xffff) + (s2 << 16);
+    s1 = s2 = 0;
+    for (i = 0; i < (len-4); i+=4) {
+	s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3] +
+	  10*CHAR_OFFSET;
+	s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3] + 4*CHAR_OFFSET);
+    }
+    for (; i < len; i++) {
+	s1 += (buf[i]+CHAR_OFFSET); s2 += s1;
+    }
+    return (s1 & 0xffff) + (s2 << 16);
 }
-#endif

-/* The "sum" buffer must be at least MAX_DIGEST_LEN bytes! */
+
 void get_checksum2(char *buf, int32 len, char *sum)
 {
-#ifdef USE_OPENSSL
-	if (xfer_sum_evp_md) {
-		static EVP_MD_CTX *evp = NULL;
+	md_context m;
+
+	if (protocol_version >= 30) {
 		uchar seedbuf[4];
-		if (!evp && !(evp = EVP_MD_CTX_create()))
-			out_of_memory("get_checksum2");
-		EVP_DigestInit_ex(evp, xfer_sum_evp_md, NULL);
+		md5_begin(&m);
+		md5_update(&m, (uchar *)buf, len);
 		if (checksum_seed) {
-			SIVALu(seedbuf, 0, checksum_seed);
-			EVP_DigestUpdate(evp, seedbuf, 4);
+			SIVAL(seedbuf, 0, checksum_seed);
+			md5_update(&m, seedbuf, 4);
 		}
-		EVP_DigestUpdate(evp, (uchar *)buf, len);
-		EVP_DigestFinal_ex(evp, (uchar *)sum, NULL);
-	} else
-#endif
-	switch (xfer_sum_nni->num) {
-#ifdef SUPPORT_XXHASH
-	  case CSUM_XXH64:
-		SIVAL64(sum, 0, XXH64(buf, len, checksum_seed));
-		break;
-#endif
-#ifdef SUPPORT_XXH3
-	  case CSUM_XXH3_64:
-		SIVAL64(sum, 0, XXH3_64bits_withSeed(buf, len, checksum_seed));
-		break;
-	  case CSUM_XXH3_128: {
-		XXH128_hash_t digest = XXH3_128bits_withSeed(buf, len, checksum_seed);
-		SIVAL64(sum, 0, digest.low64);
-		SIVAL64(sum, 8, digest.high64);
-		break;
-	  }
-#endif
-	  case CSUM_MD5: {
-		md_context m5;
-		uchar seedbuf[4];
-		md5_begin(&m5);
-		if (proper_seed_order) {
-			if (checksum_seed) {
-				SIVALu(seedbuf, 0, checksum_seed);
-				md5_update(&m5, seedbuf, 4);
-			}
-			md5_update(&m5, (uchar *)buf, len);
-		} else {
-			md5_update(&m5, (uchar *)buf, len);
-			if (checksum_seed) {
-				SIVALu(seedbuf, 0, checksum_seed);
-				md5_update(&m5, seedbuf, 4);
-			}
-		}
-		md5_result(&m5, (uchar *)sum);
-		break;
-	  }
-	  case CSUM_MD4:
-	  case CSUM_MD4_OLD:
-	  case CSUM_MD4_BUSTED:
-	  case CSUM_MD4_ARCHAIC: {
-		md_context m;
+		md5_result(&m, (uchar *)sum);
+	} else {
 		int32 i;
 		static char *buf1;
 		static int32 len1;

 		mdfour_begin(&m);

-		if (len > len1 || !buf1) {
-			free(buf1);
+		if (len > len1) {
+			if (buf1)
+				free(buf1);
 			buf1 = new_array(char, len+4);
 			len1 = len;
+			if (!buf1)
+				out_of_memory("get_checksum2");
 		}

 		memcpy(buf1, buf, len);
@@ -405,150 +93,59 @@ void get_checksum2(char *buf, int32 len, char *sum)
 		 * are multiples of 64.  This is fixed by calling mdfour_update()
 		 * even when there are no more bytes.
 		 */
-		if (len - i > 0 || xfer_sum_nni->num > CSUM_MD4_BUSTED)
+		if (len - i > 0 || protocol_version >= 27)
 			mdfour_update(&m, (uchar *)(buf1+i), len-i);

 		mdfour_result(&m, (uchar *)sum);
-		break;
-	  }
-	  default: /* paranoia to prevent missing case values */
-		exit_cleanup(RERR_UNSUPPORTED);
 	}
 }

-void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+void file_checksum(char *fname, char *sum, OFF_T size)
 {
 	struct map_struct *buf;
-	OFF_T i, len = st_p->st_size;
+	OFF_T i, len = size;
+	md_context m;
 	int32 remainder;
 	int fd;

-	fd = vfs_open_checklinks(fname);
-	if (fd == -1) {
-		memset(sum, 0, file_sum_len);
+	memset(sum, 0, MAX_DIGEST_LEN);
+
+	fd = do_open(fname, O_RDONLY, 0);
+	if (fd == -1)
 		return;
-	}

-	buf = map_file(fd, len, MAX_MAP_SIZE, CHUNK_SIZE);
+	buf = map_file(fd, size, MAX_MAP_SIZE, CSUM_CHUNK);

-#ifdef USE_OPENSSL
-	if (file_sum_evp_md) {
-		static EVP_MD_CTX *evp = NULL;
-		if (!evp && !(evp = EVP_MD_CTX_create()))
-			out_of_memory("file_checksum");
+	if (protocol_version >= 30) {
+		md5_begin(&m);

-		EVP_DigestInit_ex(evp, file_sum_evp_md, NULL);
-
-		for (i = 0; i + CHUNK_SIZE <= len; i += CHUNK_SIZE)
-			EVP_DigestUpdate(evp, (uchar *)map_ptr(buf, i, CHUNK_SIZE), CHUNK_SIZE);
+		for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+			md5_update(&m, (uchar *)map_ptr(buf, i, CSUM_CHUNK),
+				   CSUM_CHUNK);
+		}

 		remainder = (int32)(len - i);
 		if (remainder > 0)
-			EVP_DigestUpdate(evp, (uchar *)map_ptr(buf, i, remainder), remainder);
-
-		EVP_DigestFinal_ex(evp, (uchar *)sum, NULL);
-	} else
-#endif
-	switch (file_sum_nni->num) {
-#ifdef SUPPORT_XXHASH
-	  case CSUM_XXH64: {
-		static XXH64_state_t* state = NULL;
-		if (!state && !(state = XXH64_createState()))
-			out_of_memory("file_checksum");
-
-		XXH64_reset(state, 0);
-
-		for (i = 0; i + CHUNK_SIZE <= len; i += CHUNK_SIZE)
-			XXH64_update(state, (uchar *)map_ptr(buf, i, CHUNK_SIZE), CHUNK_SIZE);
-
-		remainder = (int32)(len - i);
-		if (remainder > 0)
-			XXH64_update(state, (uchar *)map_ptr(buf, i, remainder), remainder);
-
-		SIVAL64(sum, 0, XXH64_digest(state));
-		break;
-	  }
-#endif
-#ifdef SUPPORT_XXH3
-	  case CSUM_XXH3_64: {
-		static XXH3_state_t* state = NULL;
-		if (!state && !(state = XXH3_createState()))
-			out_of_memory("file_checksum");
-
-		XXH3_64bits_reset(state);
-
-		for (i = 0; i + CHUNK_SIZE <= len; i += CHUNK_SIZE)
-			XXH3_64bits_update(state, (uchar *)map_ptr(buf, i, CHUNK_SIZE), CHUNK_SIZE);
-
-		remainder = (int32)(len - i);
-		if (remainder > 0)
-			XXH3_64bits_update(state, (uchar *)map_ptr(buf, i, remainder), remainder);
-
-		SIVAL64(sum, 0, XXH3_64bits_digest(state));
-		break;
-	  }
-	  case CSUM_XXH3_128: {
-		XXH128_hash_t digest;
-		static XXH3_state_t* state = NULL;
-		if (!state && !(state = XXH3_createState()))
-			out_of_memory("file_checksum");
-
-		XXH3_128bits_reset(state);
-
-		for (i = 0; i + CHUNK_SIZE <= len; i += CHUNK_SIZE)
-			XXH3_128bits_update(state, (uchar *)map_ptr(buf, i, CHUNK_SIZE), CHUNK_SIZE);
-
-		remainder = (int32)(len - i);
-		if (remainder > 0)
-			XXH3_128bits_update(state, (uchar *)map_ptr(buf, i, remainder), remainder);
-
-		digest = XXH3_128bits_digest(state);
-		SIVAL64(sum, 0, digest.low64);
-		SIVAL64(sum, 8, digest.high64);
-		break;
-	  }
-#endif
-	  case CSUM_MD5: {
-		md_context m5;
-
-		md5_begin(&m5);
-
-		for (i = 0; i + CHUNK_SIZE <= len; i += CHUNK_SIZE)
-			md5_update(&m5, (uchar *)map_ptr(buf, i, CHUNK_SIZE), CHUNK_SIZE);
-
-		remainder = (int32)(len - i);
-		if (remainder > 0)
-			md5_update(&m5, (uchar *)map_ptr(buf, i, remainder), remainder);
-
-		md5_result(&m5, (uchar *)sum);
-		break;
-	  }
-	  case CSUM_MD4:
-	  case CSUM_MD4_OLD:
-	  case CSUM_MD4_BUSTED:
-	  case CSUM_MD4_ARCHAIC: {
-		md_context m;
+			md5_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);

+		md5_result(&m, (uchar *)sum);
+	} else {
 		mdfour_begin(&m);

-		for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK)
-			mdfour_update(&m, (uchar *)map_ptr(buf, i, CSUM_CHUNK), CSUM_CHUNK);
+		for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+			mdfour_update(&m, (uchar *)map_ptr(buf, i, CSUM_CHUNK),
+				      CSUM_CHUNK);
+		}

 		/* Prior to version 27 an incorrect MD4 checksum was computed
 		 * by failing to call mdfour_tail() for block sizes that
 		 * are multiples of 64.  This is fixed by calling mdfour_update()
 		 * even when there are no more bytes. */
 		remainder = (int32)(len - i);
-		if (remainder > 0 || file_sum_nni->num > CSUM_MD4_BUSTED)
+		if (remainder > 0 || protocol_version >= 27)
 			mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);

 		mdfour_result(&m, (uchar *)sum);
-		break;
-	  }
-	  default:
-		rprintf(FERROR, "Invalid checksum-choice for --checksum: %s (%d)\n",
-			file_sum_nni->name, file_sum_nni->num);
-		exit_cleanup(RERR_UNSUPPORTED);
 	}

 	close(fd);
@@ -556,266 +153,73 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
 }

 static int32 sumresidue;
-static md_context ctx_md;
-#ifdef SUPPORT_XXHASH
-static XXH64_state_t* xxh64_state;
-#endif
-#ifdef SUPPORT_XXH3
-static XXH3_state_t* xxh3_state;
-#endif
-static struct name_num_item *cur_sum_nni;
-int cur_sum_len;
+static md_context md;

-#ifdef USE_OPENSSL
-static const EVP_MD *cur_sum_evp_md;
-#endif
-
-/* Initialize a hash digest accumulator.  Data is supplied via
- * sum_update() and the resulting binary digest is retrieved via
- * sum_end().  This only supports one active sum at a time. */
-int sum_init(struct name_num_item *nni, int seed)
+void sum_init(int seed)
 {
 	char s[4];

-	if (!nni)
-		nni = parse_csum_name(NULL, 0);
-	cur_sum_nni = nni;
-	cur_sum_len = csum_len_for_type(nni->num, 0);
-#ifdef USE_OPENSSL
-	cur_sum_evp_md = csum_evp_md(nni);
-#endif
-
-#ifdef USE_OPENSSL
-	if (cur_sum_evp_md) {
-		if (!ctx_evp && !(ctx_evp = EVP_MD_CTX_create()))
-			out_of_memory("file_checksum");
-		EVP_DigestInit_ex(ctx_evp, cur_sum_evp_md, NULL);
-	} else
-#endif
-	switch (cur_sum_nni->num) {
-#ifdef SUPPORT_XXHASH
-	  case CSUM_XXH64:
-		if (!xxh64_state && !(xxh64_state = XXH64_createState()))
-			out_of_memory("sum_init");
-		XXH64_reset(xxh64_state, 0);
-		break;
-#endif
-#ifdef SUPPORT_XXH3
-	  case CSUM_XXH3_64:
-		if (!xxh3_state && !(xxh3_state = XXH3_createState()))
-			out_of_memory("sum_init");
-		XXH3_64bits_reset(xxh3_state);
-		break;
-	  case CSUM_XXH3_128:
-		if (!xxh3_state && !(xxh3_state = XXH3_createState()))
-			out_of_memory("sum_init");
-		XXH3_128bits_reset(xxh3_state);
-		break;
-#endif
-	  case CSUM_MD5:
-		md5_begin(&ctx_md);
-		break;
-	  case CSUM_MD4:
-		mdfour_begin(&ctx_md);
-		sumresidue = 0;
-		break;
-	  case CSUM_MD4_OLD:
-	  case CSUM_MD4_BUSTED:
-	  case CSUM_MD4_ARCHAIC:
-		mdfour_begin(&ctx_md);
+	if (protocol_version >= 30)
+		md5_begin(&md);
+	else {
+		mdfour_begin(&md);
 		sumresidue = 0;
 		SIVAL(s, 0, seed);
 		sum_update(s, 4);
-		break;
-	  case CSUM_NONE:
-		break;
-	  default: /* paranoia to prevent missing case values */
-		exit_cleanup(RERR_UNSUPPORTED);
 	}
-
-	return cur_sum_len;
 }

-/* Feed data into a hash digest accumulator. */
+/**
+ * Feed data into an MD4 accumulator, md.  The results may be
+ * retrieved using sum_end().  md is used for different purposes at
+ * different points during execution.
+ *
+ * @todo Perhaps get rid of md and just pass in the address each time.
+ * Very slightly clearer and slower.
+ **/
 void sum_update(const char *p, int32 len)
 {
-#ifdef USE_OPENSSL
-	if (cur_sum_evp_md) {
-		EVP_DigestUpdate(ctx_evp, (uchar *)p, len);
-	} else
-#endif
-	switch (cur_sum_nni->num) {
-#ifdef SUPPORT_XXHASH
-	  case CSUM_XXH64:
-		XXH64_update(xxh64_state, p, len);
-		break;
-#endif
-#ifdef SUPPORT_XXH3
-	  case CSUM_XXH3_64:
-		XXH3_64bits_update(xxh3_state, p, len);
-		break;
-	  case CSUM_XXH3_128:
-		XXH3_128bits_update(xxh3_state, p, len);
-		break;
-#endif
-	  case CSUM_MD5:
-		md5_update(&ctx_md, (uchar *)p, len);
-		break;
-	  case CSUM_MD4:
-	  case CSUM_MD4_OLD:
-	  case CSUM_MD4_BUSTED:
-	  case CSUM_MD4_ARCHAIC:
-		if (len + sumresidue < CSUM_CHUNK) {
-			memcpy(ctx_md.buffer + sumresidue, p, len);
-			sumresidue += len;
-			break;
-		}
-
-		if (sumresidue) {
-			int32 i = CSUM_CHUNK - sumresidue;
-			memcpy(ctx_md.buffer + sumresidue, p, i);
-			mdfour_update(&ctx_md, (uchar *)ctx_md.buffer, CSUM_CHUNK);
-			len -= i;
-			p += i;
-		}
-
-		while (len >= CSUM_CHUNK) {
-			mdfour_update(&ctx_md, (uchar *)p, CSUM_CHUNK);
-			len -= CSUM_CHUNK;
-			p += CSUM_CHUNK;
-		}
-
-		sumresidue = len;
-		if (sumresidue)
-			memcpy(ctx_md.buffer, p, sumresidue);
-		break;
-	  case CSUM_NONE:
-		break;
-	  default: /* paranoia to prevent missing case values */
-		exit_cleanup(RERR_UNSUPPORTED);
-	}
-}
-
-/* The sum buffer only needs to be as long as the current checksum's digest
- * len, not MAX_DIGEST_LEN. Note that for CSUM_MD4_ARCHAIC that is the full
- * MD4_DIGEST_LEN even if the file-list code is going to ignore all but the
- * first 2 bytes of it. */
-void sum_end(char *sum)
-{
-#ifdef USE_OPENSSL
-	if (cur_sum_evp_md) {
-		EVP_DigestFinal_ex(ctx_evp, (uchar *)sum, NULL);
-	} else
-#endif
-	switch (cur_sum_nni->num) {
-#ifdef SUPPORT_XXHASH
-	  case CSUM_XXH64:
-		SIVAL64(sum, 0, XXH64_digest(xxh64_state));
-		break;
-#endif
-#ifdef SUPPORT_XXH3
-	  case CSUM_XXH3_64:
-		SIVAL64(sum, 0, XXH3_64bits_digest(xxh3_state));
-		break;
-	  case CSUM_XXH3_128: {
-		XXH128_hash_t digest = XXH3_128bits_digest(xxh3_state);
-		SIVAL64(sum, 0, digest.low64);
-		SIVAL64(sum, 8, digest.high64);
-		break;
-	  }
-#endif
-	  case CSUM_MD5:
-		md5_result(&ctx_md, (uchar *)sum);
-		break;
-	  case CSUM_MD4:
-	  case CSUM_MD4_OLD:
-		mdfour_update(&ctx_md, (uchar *)ctx_md.buffer, sumresidue);
-		mdfour_result(&ctx_md, (uchar *)sum);
-		break;
-	  case CSUM_MD4_BUSTED:
-	  case CSUM_MD4_ARCHAIC:
-		if (sumresidue)
-			mdfour_update(&ctx_md, (uchar *)ctx_md.buffer, sumresidue);
-		mdfour_result(&ctx_md, (uchar *)sum);
-		break;
-	  case CSUM_NONE:
-		*sum = '\0';
-		break;
-	  default: /* paranoia to prevent missing case values */
-		exit_cleanup(RERR_UNSUPPORTED);
-	}
-}
-
-#if defined SUPPORT_XXH3 || defined USE_OPENSSL
-static void verify_digest(struct name_num_item *nni, BOOL check_auth_list)
-{
-#ifdef SUPPORT_XXH3
-	static int xxh3_result = 0;
-#endif
-#ifdef USE_OPENSSL
-	static int prior_num = 0, prior_flags = 0, prior_result = 0;
-#endif
-
-#ifdef SUPPORT_XXH3
-	if (nni->num == CSUM_XXH3_64 || nni->num == CSUM_XXH3_128) {
-		if (!xxh3_result) {
-			char buf[32816];
-			int j;
-			for (j = 0; j < (int)sizeof buf; j++)
-				buf[j] = ' ' + (j % 96);
-			sum_init(nni, 0);
-			sum_update(buf, 32816);
-			sum_update(buf, 31152);
-			sum_update(buf, 32474);
-			sum_update(buf, 9322);
-			xxh3_result = XXH3_64bits_digest(xxh3_state) != 0xadbcf16d4678d1de ? -1 : 1;
-		}
-		if (xxh3_result < 0)
-			nni->num = CSUM_gone;
+	if (protocol_version >= 30) {
+		md5_update(&md, (uchar *)p, len);
 		return;
 	}
-#endif

-#ifdef USE_OPENSSL
-	if (BITS_SETnUNSET(nni->flags, NNI_EVP, NNI_BUILTIN|NNI_EVP_OK)) {
-		if (nni->num == prior_num && nni->flags == prior_flags) {
-			nni->flags = prior_result;
-			if (!(nni->flags & NNI_EVP))
-				nni->num = CSUM_gone;
-		} else {
-			prior_num = nni->num;
-			prior_flags = nni->flags;
-			if (!csum_evp_md(nni))
-				nni->num = CSUM_gone;
-			prior_result = nni->flags;
-			if (check_auth_list && (nni = get_nni_by_num(&valid_auth_checksums, prior_num)) != NULL)
-				verify_digest(nni, False);
-		}
-	}
-#endif
-}
-#endif
-
-void init_checksum_choices()
-{
-#if defined SUPPORT_XXH3 || defined USE_OPENSSL
-	struct name_num_item *nni;
-#endif
-
-	if (initialized_choices)
+	if (len + sumresidue < CSUM_CHUNK) {
+		memcpy(md.buffer + sumresidue, p, len);
+		sumresidue += len;
 		return;
+	}

-#if defined USE_OPENSSL && OPENSSL_VERSION_NUMBER < 0x10100000L
-	OpenSSL_add_all_algorithms();
-#endif
+	if (sumresidue) {
+		int32 i = CSUM_CHUNK - sumresidue;
+		memcpy(md.buffer + sumresidue, p, i);
+		mdfour_update(&md, (uchar *)md.buffer, CSUM_CHUNK);
+		len -= i;
+		p += i;
+	}

-#if defined SUPPORT_XXH3 || defined USE_OPENSSL
-	for (nni = valid_checksums.list; nni->name; nni++)
-		verify_digest(nni, True);
+	while (len >= CSUM_CHUNK) {
+		mdfour_update(&md, (uchar *)p, CSUM_CHUNK);
+		len -= CSUM_CHUNK;
+		p += CSUM_CHUNK;
+	}

-	for (nni = valid_auth_checksums.list; nni->name; nni++)
-		verify_digest(nni, False);
-#endif
-
-	initialized_choices = 1;
+	sumresidue = len;
+	if (sumresidue)
+		memcpy(md.buffer, p, sumresidue);
+}
+
+int sum_end(char *sum)
+{
+	if (protocol_version >= 30) {
+		md5_result(&md, (uchar *)sum);
+		return MD5_DIGEST_LEN;
+	}
+
+	if (sumresidue || protocol_version >= 27)
+		mdfour_update(&md, (uchar *)md.buffer, sumresidue);
+
+	mdfour_result(&md, (uchar *)sum);
+
+	return MD4_DIGEST_LEN;
 }
@@ -2,7 +2,7 @@
 * Implement the core of the --chmod option.
 *
 * Copyright (C) 2002 Scott Howard
- * Copyright (C) 2005-2020 Wayne Davison
+ * Copyright (C) 2005-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
 */

 #include "rsync.h"
-#include "itypes.h"

 extern mode_t orig_umask;

@@ -29,48 +28,32 @@ extern mode_t orig_umask;

 struct chmod_mode_struct {
 	struct chmod_mode_struct *next;
-	int ModeAND, ModeOR, ModeCOPY_SRC, ModeCOPY_DST, ModeCOPY_AND, ModeOP;
+	int ModeAND, ModeOR;
 	char flags;
 };

 #define CHMOD_ADD 1
 #define CHMOD_SUB 2
 #define CHMOD_EQ  3
-#define CHMOD_SET 4

 #define STATE_ERROR 0
 #define STATE_1ST_HALF 1
 #define STATE_2ND_HALF 2
-#define STATE_OCTAL_NUM 3
-
-static int mode_dest_special_bits(int where)
-{
-	int bits = 0;
-
-	if (where & 0100)
-		bits |= S_ISUID;
-	if (where & 0010)
-		bits |= S_ISGID;
-	if (where & 0001)
-		bits |= S_ISVTX;
-
-	return bits;
-}

 /* Parse a chmod-style argument, and break it down into one or more AND/OR
- * pairs in a linked list.  We return a pointer to new items on success
+ * pairs in a linked list.  We return a pointer to new items on succcess
 * (appending the items to the specified list), or NULL on error. */
 struct chmod_mode_struct *parse_chmod(const char *modestr,
 				      struct chmod_mode_struct **root_mode_ptr)
 {
 	int state = STATE_1ST_HALF;
-	int where = 0, what = 0, op = 0, topbits = 0, topoct = 0, flags = 0, copybits = 0;
+	int where = 0, what = 0, op = 0, topbits = 0, topoct = 0, flags = 0;
 	struct chmod_mode_struct *first_mode = NULL, *curr_mode = NULL,
 				 *prev_mode = NULL;

 	while (state != STATE_ERROR) {
 		if (!*modestr || *modestr == ',') {
-			int bits, where_specified;
+			int bits;

 			if (!op) {
 				state = STATE_ERROR;
@@ -84,10 +67,9 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
 				first_mode = curr_mode;
 			curr_mode->next = NULL;

-			where_specified = where;
-			if (where) {
+			if (where)
 				bits = where * what;
-			} else {
+			else {
 				where = 0111;
 				bits = (where * what) & ~orig_umask;
 			}
@@ -96,35 +78,14 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
 			case CHMOD_ADD:
 				curr_mode->ModeAND = CHMOD_BITS;
 				curr_mode->ModeOR  = bits + topoct;
-				curr_mode->ModeCOPY_SRC = copybits;
-				curr_mode->ModeCOPY_DST = where;
-				curr_mode->ModeCOPY_AND = where_specified ? CHMOD_BITS : ~orig_umask;
-				curr_mode->ModeOP = op;
 				break;
 			case CHMOD_SUB:
 				curr_mode->ModeAND = CHMOD_BITS - bits - topoct;
 				curr_mode->ModeOR  = 0;
-				curr_mode->ModeCOPY_SRC = copybits;
-				curr_mode->ModeCOPY_DST = where;
-				curr_mode->ModeCOPY_AND = where_specified ? CHMOD_BITS : ~orig_umask;
-				curr_mode->ModeOP = op;
 				break;
 			case CHMOD_EQ:
-				curr_mode->ModeAND = CHMOD_BITS - (where * 7) - (topoct ? topbits : 0)
-						    - (copybits ? mode_dest_special_bits(where) : 0);
+				curr_mode->ModeAND = CHMOD_BITS - (where * 7) - (topoct ? topbits : 0);
 				curr_mode->ModeOR  = bits + topoct;
-				curr_mode->ModeCOPY_SRC = copybits;
-				curr_mode->ModeCOPY_DST = where;
-				curr_mode->ModeCOPY_AND = where_specified ? CHMOD_BITS : ~orig_umask;
-				curr_mode->ModeOP = op;
-				break;
-			case CHMOD_SET:
-				curr_mode->ModeAND = 0;
-				curr_mode->ModeOR  = bits;
-				curr_mode->ModeCOPY_SRC = 0;
-				curr_mode->ModeCOPY_DST = 0;
-				curr_mode->ModeCOPY_AND = CHMOD_BITS;
-				curr_mode->ModeOP = op;
 				break;
 			}

@@ -135,11 +96,10 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
 			modestr++;

 			state = STATE_1ST_HALF;
-			where = what = op = topoct = topbits = flags = copybits = 0;
+			where = what = op = topoct = topbits = flags = 0;
 		}

-		switch (state) {
-		case STATE_1ST_HALF:
+		if (state != STATE_2ND_HALF) {
 			switch (*modestr) {
 			case 'D':
 				if (flags & FLAG_FILES_ONLY)
@@ -164,7 +124,6 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
 				break;
 			case 'a':
 				where |= 0111;
-				topbits |= 06000; /* a+s sets BOTH setuid and setgid (like chmod(1)) */
 				break;
 			case '+':
 				op = CHMOD_ADD;
@@ -179,79 +138,36 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
 				state = STATE_2ND_HALF;
 				break;
 			default:
-				if (isDigit(modestr) && *modestr < '8' && !where) {
-					op = CHMOD_SET;
-					state =  STATE_OCTAL_NUM;
-					where = 1;
-					what = *modestr - '0';
-				} else
-					state = STATE_ERROR;
+				state = STATE_ERROR;
 				break;
 			}
-			break;
-		case STATE_2ND_HALF:
+		} else {
 			switch (*modestr) {
 			case 'r':
-				if (copybits)
-					state = STATE_ERROR;
 				what |= 4;
 				break;
 			case 'w':
-				if (copybits)
-					state = STATE_ERROR;
 				what |= 2;
 				break;
 			case 'X':
-				if (copybits)
-					state = STATE_ERROR;
 				flags |= FLAG_X_KEEP;
 				/* FALL THROUGH */
 			case 'x':
-				if (copybits)
-					state = STATE_ERROR;
 				what |= 1;
 				break;
 			case 's':
-				if (copybits)
-					state = STATE_ERROR;
 				if (topbits)
 					topoct |= topbits;
 				else
 					topoct = 04000;
 				break;
 			case 't':
-				if (copybits)
-					state = STATE_ERROR;
 				topoct |= 01000;
 				break;
-			case 'u':
-				if (what || topoct || copybits)
-					state = STATE_ERROR;
-				copybits = 0100;
-				break;
-			case 'g':
-				if (what || topoct || copybits)
-					state = STATE_ERROR;
-				copybits = 0010;
-				break;
-			case 'o':
-				if (what || topoct || copybits)
-					state = STATE_ERROR;
-				copybits = 0001;
-				break;
 			default:
 				state = STATE_ERROR;
 				break;
 			}
-			break;
-		case STATE_OCTAL_NUM:
-			if (isDigit(modestr) && *modestr < '8') {
-				what = what*8 + *modestr - '0';
-				if (what > CHMOD_BITS)
-					state = STATE_ERROR;
-			} else
-				state = STATE_ERROR;
-			break;
 		}
 		modestr++;
 	}
@@ -272,20 +188,6 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
 	return first_mode;
 }

-static int mode_copy_bits(int mode, int copy_src, int copy_dst, int copy_and)
-{
-	int copy_bits = 0;
-
-	if (copy_src & 0100)
-		copy_bits |= (mode >> 6) & 7;
-	if (copy_src & 0010)
-		copy_bits |= (mode >> 3) & 7;
-	if (copy_src & 0001)
-		copy_bits |= mode & 7;
-
-	return (copy_dst * copy_bits) & copy_and;
-}
-

 /* Takes an existing file permission and a list of AND/OR changes, and
 * create a new permissions. */
@@ -293,25 +195,17 @@ int tweak_mode(int mode, struct chmod_mode_struct *chmod_modes)
 {
 	int IsX = mode & 0111;
 	int NonPerm = mode & ~CHMOD_BITS;
-	int copy_bits;

 	for ( ; chmod_modes; chmod_modes = chmod_modes->next) {
 		if ((chmod_modes->flags & FLAG_DIRS_ONLY) && !S_ISDIR(NonPerm))
 			continue;
 		if ((chmod_modes->flags & FLAG_FILES_ONLY) && S_ISDIR(NonPerm))
 			continue;
-		copy_bits = mode_copy_bits(mode, chmod_modes->ModeCOPY_SRC,
-					   chmod_modes->ModeCOPY_DST,
-					   chmod_modes->ModeCOPY_AND);
 		mode &= chmod_modes->ModeAND;
 		if ((chmod_modes->flags & FLAG_X_KEEP) && !IsX && !S_ISDIR(NonPerm))
 			mode |= chmod_modes->ModeOR & ~0111;
 		else
 			mode |= chmod_modes->ModeOR;
-		if (chmod_modes->ModeOP == CHMOD_SUB)
-			mode &= CHMOD_BITS - copy_bits;
-		else
-			mode |= copy_bits;
 	}

 	return mode | NonPerm;
@@ -4,7 +4,7 @@
 * Copyright (C) 1996-2000 Andrew Tridgell
 * Copyright (C) 1996 Paul Mackerras
 * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2020 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -22,23 +22,14 @@

 #include "rsync.h"

-extern int dry_run;
 extern int am_server;
 extern int am_daemon;
-extern int am_receiver;
-extern int am_sender;
 extern int io_error;
 extern int keep_partial;
 extern int got_xfer_error;
-extern int protocol_version;
-extern int output_needs_newline;
 extern char *partial_dir;
 extern char *logfile_name;

-int called_from_signal_handler = 0;
-BOOL shutting_down = False;
-BOOL flush_ok_after_signal = False;
-
 #ifdef HAVE_SIGACTION
 static struct sigaction sigact;
 #endif
@@ -58,7 +49,7 @@ void close_all(void)

 	max_fd = sysconf(_SC_OPEN_MAX) - 1;
 	for (fd = max_fd; fd >= 0; fd--) {
-		if ((ret = vfs_fstat(fd, &st)) == 0) {
+		if ((ret = do_fstat(fd, &st)) == 0) {
 			if (is_a_socket(fd))
 				ret = shutdown(fd, 2);
 			ret = close(fd);
@@ -90,7 +81,7 @@ int cleanup_got_literal = 0;
 static const char *cleanup_fname;
 static const char *cleanup_new_fname;
 static struct file_struct *cleanup_file;
-static int cleanup_fd_r = -1, cleanup_fd_w = -1;
+static int cleanup_fd_r, cleanup_fd_w;
 static pid_t cleanup_pid = 0;

 pid_t cleanup_child_pid = -1;
@@ -102,104 +93,75 @@ pid_t cleanup_child_pid = -1;
 **/
 NORETURN void _exit_cleanup(int code, const char *file, int line)
 {
-	static int switch_step = 0;
-	static int exit_code = 0, exit_line = 0;
-	static const char *exit_file = NULL;
-	static int first_code = 0;
+	static int cleanup_step = 0;
+	static int exit_code = 0;
+	static int unmodified_code = 0;

 	SIGACTION(SIGUSR1, SIG_IGN);
 	SIGACTION(SIGUSR2, SIG_IGN);

-	if (!exit_code) { /* Preserve first error exit info when recursing. */
-		exit_code = code;
-		exit_file = file;
-		exit_line = line < 0 ? -line : line;
-	}
+	if (exit_code) /* Preserve first error code when recursing. */
+		code = exit_code;

 	/* If this is the exit at the end of the run, the server side
-	 * should not attempt to output a message (see log_exit()). */
+	 * should not attempt to output a message (see log.c). */
 	if (am_server && code == 0)
 		am_server = 2;

 	/* Some of our actions might cause a recursive call back here, so we
 	 * keep track of where we are in the cleanup and never repeat a step. */
-	switch (switch_step) {
-#include "case_N.h" /* case 0: */
-		switch_step++;
+	switch (cleanup_step) {
+#include "case_N.h" /* case 0: cleanup_step++; */

-		first_code = code;
+		exit_code = unmodified_code = code;

-		if (output_needs_newline) {
-			fputc('\n', stdout);
-			output_needs_newline = 0;
-		}
-
-		if (DEBUG_GTE(EXIT, 2)) {
+		if (verbose > 3) {
 			rprintf(FINFO,
-				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n",
-				who_am_i(), code, src_file(file), line);
+				"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
+				code, file, line);
 		}

+		/* FALLTHROUGH */
 #include "case_N.h"
-		switch_step++;

 		if (cleanup_child_pid != -1) {
 			int status;
 			int pid = wait_process(cleanup_child_pid, &status, WNOHANG);
 			if (pid == cleanup_child_pid) {
 				status = WEXITSTATUS(status);
-				if (status > exit_code)
-					exit_code = status;
+				if (status > code)
+					code = exit_code = status;
 			}
 		}

+		/* FALLTHROUGH */
 #include "case_N.h"
-		switch_step++;

-		if (cleanup_got_literal && (cleanup_fname || cleanup_fd_w != -1)) {
-			if (cleanup_fd_r != -1) {
+		if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
+		 && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
+			const char *fname = cleanup_fname;
+			cleanup_fname = NULL;
+			if (cleanup_fd_r != -1)
 				close(cleanup_fd_r);
-				cleanup_fd_r = -1;
-			}
 			if (cleanup_fd_w != -1) {
 				flush_write_file(cleanup_fd_w);
 				close(cleanup_fd_w);
-				cleanup_fd_w = -1;
-			}
-			if (cleanup_fname && cleanup_new_fname && keep_partial
-			 && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
-				int tweak_modtime = 0;
-				const char *fname = cleanup_fname;
-				cleanup_fname = NULL;
-				if (!partial_dir) {
-					/* We don't want to leave a partial file with a modern time or it
-					 * could be skipped via --update.  Setting the time to something
-					 * really old also helps it to stand out as unfinished in an ls. */
-					tweak_modtime = 1;
-					cleanup_file->modtime = 0;
-				}
-				finish_transfer(cleanup_new_fname, fname, NULL, NULL,
-						cleanup_file, tweak_modtime, !partial_dir);
 			}
+			finish_transfer(cleanup_new_fname, fname, NULL, NULL,
+					cleanup_file, 0, !partial_dir);
 		}

+		/* FALLTHROUGH */
 #include "case_N.h"
-		switch_step++;

-		if (flush_ok_after_signal) {
-			flush_ok_after_signal = False;
-			if (code == RERR_SIGNAL)
-				io_flush(FULL_FLUSH);
-		}
-		if (!exit_code && !code)
-			io_flush(FULL_FLUSH);
+		io_flush(FULL_FLUSH);

+		/* FALLTHROUGH */
 #include "case_N.h"
-		switch_step++;

 		if (cleanup_fname)
-			vfs_unlink(VFS_AT_FDCWD, cleanup_fname, 0);
-		if (exit_code)
+			do_unlink(cleanup_fname);
+		if (code)
 			kill_all(SIGUSR1);
 		if (cleanup_pid && cleanup_pid == getpid()) {
 			char *pidf = lp_pid_file();
@@ -207,60 +169,32 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 				unlink(lp_pid_file());
 		}

-		if (exit_code == 0) {
-			if (code)
-				exit_code = code;
+		if (code == 0) {
 			if (io_error & IOERR_DEL_LIMIT)
-				exit_code = RERR_DEL_LIMIT;
+				code = exit_code = RERR_DEL_LIMIT;
 			if (io_error & IOERR_VANISHED)
-				exit_code = RERR_VANISHED;
+				code = exit_code = RERR_VANISHED;
 			if (io_error & IOERR_GENERAL || got_xfer_error)
-				exit_code = RERR_PARTIAL;
+				code = exit_code = RERR_PARTIAL;
 		}

-		/* If line < 0, this exit is after a MSG_ERROR_EXIT event, so
-		 * we don't want to output a duplicate error. */
-		if ((exit_code && line > 0)
-		 || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1)))) {
-			log_exit(exit_code, exit_file, exit_line);
-		}
+		if (code || am_daemon || (logfile_name && (am_server || !verbose)))
+			log_exit(code, file, line);

+		/* FALLTHROUGH */
 #include "case_N.h"
-		switch_step++;

-		if (DEBUG_GTE(EXIT, 1)) {
+		if (verbose > 2) {
 			rprintf(FINFO,
-				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): "
-				"about to call exit(%d)%s\n",
-				who_am_i(), first_code, exit_file, exit_line, exit_code,
-				dry_run ? " (DRY RUN)" : "");
+				"_exit_cleanup(code=%d, file=%s, line=%d): "
+				"about to call exit(%d)\n",
+				unmodified_code, file, line, code);
 		}

+		/* FALLTHROUGH */
 #include "case_N.h"
-		switch_step++;

-		if (exit_code && exit_code != RERR_SOCKETIO && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
-		 && exit_code != RERR_TIMEOUT && !shutting_down) {
-			if (protocol_version >= 31 || am_receiver) {
-				if (line > 0) {
-					if (DEBUG_GTE(EXIT, 3)) {
-						rprintf(FINFO, "[%s] sending MSG_ERROR_EXIT with exit_code %d\n",
-							who_am_i(), exit_code);
-					}
-					send_msg_int(MSG_ERROR_EXIT, exit_code);
-				}
-				if (!am_sender)
-					io_flush(MSG_FLUSH); /* Be sure to send all messages */
-				noop_io_until_death();
-			}
-			else if (!am_sender)
-				io_flush(MSG_FLUSH); /* Be sure to send all messages */
-		}
-
-#include "case_N.h"
-		switch_step++;
-
-		if (am_server && exit_code)
+		if (am_server && code)
 			msleep(100);
 		close_all();

@@ -269,23 +203,12 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 		break;
 	}

-	if (called_from_signal_handler) {
-#ifdef GCOV_COVERAGE
-		/* _exit() bypasses the gcov atexit flush; rsync's generator (and
-		 * other processes) normally finish via the signal handler, so
-		 * without this they would write no .gcda. Harmless otherwise. */
-		extern void __gcov_dump(void);
-		__gcov_dump();
-#endif
-		_exit(exit_code);
-	}
-	exit(exit_code);
+	exit(code);
 }

 void cleanup_disable(void)
 {
 	cleanup_fname = cleanup_new_fname = NULL;
-	cleanup_fd_r = cleanup_fd_w = -1;
 	cleanup_got_literal = 0;
 }

@@ -3,7 +3,7 @@
 *
 * Copyright (C) 1992-2001 Andrew Tridgell <tridge@samba.org>
 * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2022 Wayne Davison
+ * Copyright (C) 2002-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -27,60 +27,50 @@
 */

 #include "rsync.h"
-#include "itypes.h"
-
-extern int am_daemon;

 static const char default_name[] = "UNKNOWN";
-static const char proxyv2sig[] = "\r\n\r\n\0\r\nQUIT\n";
+extern int am_server;

-static char ipaddr_buf[100];

-#define PROXY_V2_SIG_SIZE ((int)sizeof proxyv2sig - 1)
-#define PROXY_V2_HEADER_SIZE (PROXY_V2_SIG_SIZE + 1 + 1 + 2)
-
-#define CMD_LOCAL 0
-#define CMD_PROXY 1
-
-#define PROXY_FAM_TCPv4 0x11
-#define PROXY_FAM_TCPv6 0x21
-
-#define GET_SOCKADDR_FAMILY(ss) ((struct sockaddr*)ss)->sa_family
-
-static void client_sockaddr(int fd, struct sockaddr_storage *ss, socklen_t *ss_len);
-static int check_name(const char *ipaddr, const struct sockaddr_storage *ss, char *name_buf, size_t name_buf_size);
-static int valid_ipaddr(const char *s, int allow_scope);
-
-/* Return the IP addr of the client as a string. */
+/**
+ * Return the IP addr of the client as a string
+ **/
 char *client_addr(int fd)
 {
+	static char addr_buf[100];
+	static int initialised;
 	struct sockaddr_storage ss;
 	socklen_t length = sizeof ss;
+	char *ssh_info, *p;

-	if (*ipaddr_buf)
-		return ipaddr_buf;
+	if (initialised)
+		return addr_buf;

-	if (am_daemon < 0) {	/* daemon over --rsh mode */
-		char *env_str;
-		strlcpy(ipaddr_buf, "0.0.0.0", sizeof ipaddr_buf);
-		if ((env_str = getenv("REMOTE_HOST")) != NULL
-		 || (env_str = getenv("SSH_CONNECTION")) != NULL
-		 || (env_str = getenv("SSH_CLIENT")) != NULL
-		 || (env_str = getenv("SSH2_CLIENT")) != NULL) {
-			char *p;
-			strlcpy(ipaddr_buf, env_str, sizeof ipaddr_buf);
+	initialised = 1;
+
+	if (am_server) {	/* daemon over --rsh mode */
+		strlcpy(addr_buf, "0.0.0.0", sizeof addr_buf);
+		if ((ssh_info = getenv("SSH_CONNECTION")) != NULL
+		    || (ssh_info = getenv("SSH_CLIENT")) != NULL
+		    || (ssh_info = getenv("SSH2_CLIENT")) != NULL) {
+			strlcpy(addr_buf, ssh_info, sizeof addr_buf);
 			/* Truncate the value to just the IP address. */
-			if ((p = strchr(ipaddr_buf, ' ')) != NULL)
+			if ((p = strchr(addr_buf, ' ')) != NULL)
 				*p = '\0';
 		}
-		if (valid_ipaddr(ipaddr_buf, True))
-			return ipaddr_buf;
+	} else {
+		client_sockaddr(fd, &ss, &length);
+		getnameinfo((struct sockaddr *)&ss, length,
+			    addr_buf, sizeof addr_buf, NULL, 0, NI_NUMERICHOST);
 	}

-	client_sockaddr(fd, &ss, &length);
-	getnameinfo((struct sockaddr *)&ss, length, ipaddr_buf, sizeof ipaddr_buf, NULL, 0, NI_NUMERICHOST);
+	return addr_buf;
+}

-	return ipaddr_buf;
+
+static int get_sockaddr_family(const struct sockaddr_storage *ss)
+{
+	return ((struct sockaddr *) ss)->sa_family;
 }


@@ -97,218 +87,71 @@ char *client_addr(int fd)
 * After translation from sockaddr to name we do a forward lookup to
 * make sure nobody is spoofing PTR records.
 **/
-char *client_name(const char *ipaddr)
+char *client_name(int fd)
 {
 	static char name_buf[100];
-	char port_buf[100];
+	static char port_buf[100];
+	static int initialised;
 	struct sockaddr_storage ss;
 	socklen_t ss_len;
-	struct addrinfo hint, *answer;
-	int err;

-	if (*name_buf)
+	if (initialised)
 		return name_buf;

 	strlcpy(name_buf, default_name, sizeof name_buf);
-
-	if (strcmp(ipaddr, "0.0.0.0") == 0)
-		return name_buf;
+	initialised = 1;

 	memset(&ss, 0, sizeof ss);
-	memset(&hint, 0, sizeof hint);
+
+	if (am_server) {	/* daemon over --rsh mode */
+		char *addr = client_addr(fd);
+		struct addrinfo hint, *answer;
+		int err;
+
+		if (strcmp(addr, "0.0.0.0") == 0)
+			return name_buf;
+
+		memset(&hint, 0, sizeof hint);

 #ifdef AI_NUMERICHOST
-	hint.ai_flags = AI_NUMERICHOST;
+		hint.ai_flags = AI_NUMERICHOST;
 #endif
-	hint.ai_socktype = SOCK_STREAM;
+		hint.ai_socktype = SOCK_STREAM;

-	if ((err = getaddrinfo(ipaddr, NULL, &hint, &answer)) != 0) {
-		rprintf(FLOG, "malformed address %s: %s\n", ipaddr, gai_strerror(err));
-		return name_buf;
-	}
+		if ((err = getaddrinfo(addr, NULL, &hint, &answer)) != 0) {
+			rprintf(FLOG, "malformed address %s: %s\n",
+			        addr, gai_strerror(err));
+			return name_buf;
+		}

-	switch (answer->ai_family) {
-	case AF_INET:
-		ss_len = sizeof (struct sockaddr_in);
-		memcpy(&ss, answer->ai_addr, ss_len);
-		break;
+		switch (answer->ai_family) {
+		case AF_INET:
+			ss_len = sizeof (struct sockaddr_in);
+			memcpy(&ss, answer->ai_addr, ss_len);
+			break;
 #ifdef INET6
-	case AF_INET6:
-		ss_len = sizeof (struct sockaddr_in6);
-		memcpy(&ss, answer->ai_addr, ss_len);
-		break;
+		case AF_INET6:
+			ss_len = sizeof (struct sockaddr_in6);
+			memcpy(&ss, answer->ai_addr, ss_len);
+			break;
 #endif
-	default:
-		NOISY_DEATH("Unknown ai_family value");
+		default:
+			exit_cleanup(RERR_SOCKETIO);
+		}
+		freeaddrinfo(answer);
+	} else {
+		ss_len = sizeof ss;
+		client_sockaddr(fd, &ss, &ss_len);
 	}
-	freeaddrinfo(answer);

-	/* reverse lookup */
-	err = getnameinfo((struct sockaddr*)&ss, ss_len, name_buf, sizeof name_buf,
-			  port_buf, sizeof port_buf, NI_NAMEREQD | NI_NUMERICSERV);
-	if (err) {
-		strlcpy(name_buf, default_name, sizeof name_buf);
-		rprintf(FLOG, "name lookup failed for %s: %s\n", ipaddr, gai_strerror(err));
-	} else
-		check_name(ipaddr, &ss, name_buf, sizeof name_buf);
+	if (lookup_name(fd, &ss, ss_len, name_buf, sizeof name_buf,
+			port_buf, sizeof port_buf) == 0)
+		check_name(fd, &ss, name_buf, sizeof name_buf);

 	return name_buf;
 }


-/* Try to read a proxy protocol header (V1 or V2). Returns 1 on success or 0 on failure. */
-int read_proxy_protocol_header(int fd)
-{
-	union {
-		struct {
-			char line[108];
-		} v1;
-		struct {
-			char sig[PROXY_V2_SIG_SIZE];
-			char ver_cmd;
-			char fam;
-			unsigned char len[2];
-			union {
-				struct {
-					char src_addr[4];
-					char dst_addr[4];
-					char src_port[2];
-					char dst_port[2];
-				} ip4;
-				struct {
-					char src_addr[16];
-					char dst_addr[16];
-					char src_port[2];
-					char dst_port[2];
-				} ip6;
-				struct {
-					char src_addr[108];
-					char dst_addr[108];
-				} unx;
-			} addr;
-		} v2;
-	} hdr;
-
-	read_buf(fd, (char*)&hdr, PROXY_V2_SIG_SIZE);
-
-	if (memcmp(hdr.v2.sig, proxyv2sig, PROXY_V2_SIG_SIZE) == 0) { /* Proxy V2 */
-		int ver, cmd, size;
-
-		read_buf(fd, (char*)&hdr + PROXY_V2_SIG_SIZE, PROXY_V2_HEADER_SIZE - PROXY_V2_SIG_SIZE);
-
-		ver = (hdr.v2.ver_cmd & 0xf0) >> 4;
-		cmd = (hdr.v2.ver_cmd & 0x0f);
-		size = (hdr.v2.len[0] << 8) + hdr.v2.len[1];
-
-		if (ver != 2 || size + PROXY_V2_HEADER_SIZE > (int)sizeof hdr)
-			return 0;
-
-		/* Grab all the remaining data in the binary request. */
-		read_buf(fd, (char*)&hdr + PROXY_V2_HEADER_SIZE, size);
-
-		switch (cmd) {
-		case CMD_PROXY:
-			switch (hdr.v2.fam) {
-			case PROXY_FAM_TCPv4:
-				if (size != sizeof hdr.v2.addr.ip4)
-					return 0;
-				inet_ntop(AF_INET, hdr.v2.addr.ip4.src_addr, ipaddr_buf, sizeof ipaddr_buf);
-				return valid_ipaddr(ipaddr_buf, False);
-#ifdef INET6
-			case PROXY_FAM_TCPv6:
-				if (size != sizeof hdr.v2.addr.ip6)
-					return 0;
-				inet_ntop(AF_INET6, hdr.v2.addr.ip6.src_addr, ipaddr_buf, sizeof ipaddr_buf);
-				return valid_ipaddr(ipaddr_buf, False);
-#endif
-			default:
-				break;
-			}
-			/* For an unsupported protocol we'll ignore the proxy data (leaving ipaddr_buf unset)
-			 * and accept the connection, which will get handled as a normal socket addr. */
-			return 1;
-		case CMD_LOCAL:
-			return 1;
-		default:
-			break;
-		}
-
-		return 0;
-	}
-
-	if (memcmp(hdr.v1.line, "PROXY", 5) == 0) { /* Proxy V1 */
-		char *endc, *sp, *p = hdr.v1.line + PROXY_V2_SIG_SIZE;
-		int port_chk;
-
-		*p = '\0';
-		if (!strchr(hdr.v1.line, '\n')) {
-			while (1) {
-				read_buf(fd, p, 1);
-				if (*p++ == '\n')
-					break;
-				if (p - hdr.v1.line >= (int)sizeof hdr.v1.line - 1)
-					return 0;
-			}
-			*p = '\0';
-		}
-
-		endc = strchr(hdr.v1.line, '\r');
-		if (!endc || endc[1] != '\n' || endc[2])
-			return 0;
-		*endc = '\0';
-
-		p = hdr.v1.line + 5;
-
-		if (!isSpace(p++))
-			return 0;
-		if (strncmp(p, "TCP4", 4) == 0)
-			p += 4;
-		else if (strncmp(p, "TCP6", 4) == 0)
-			p += 4;
-		else if (strncmp(p, "UNKNOWN", 7) == 0)
-			return 1;
-		else
-			return 0;
-
-		if (!isSpace(p++))
-			return 0;
-
-		if ((sp = strchr(p, ' ')) == NULL)
-			return 0;
-		*sp = '\0';
-		if (!valid_ipaddr(p, False))
-			return 0;
-		strlcpy(ipaddr_buf, p, sizeof ipaddr_buf); /* It will always fit when valid. */
-
-		p = sp + 1;
-		if ((sp = strchr(p, ' ')) == NULL)
-			return 0;
-		*sp = '\0';
-		if (!valid_ipaddr(p, False))
-			return 0;
-		/* Ignore destination address. */
-
-		p = sp + 1;
-		if ((sp = strchr(p, ' ')) == NULL)
-			return 0;
-		*sp = '\0';
-		port_chk = strtol(p, &endc, 10);
-		if (*endc || port_chk == 0)
-			return 0;
-		/* Ignore source port. */
-
-		p = sp + 1;
-		port_chk = strtol(p, &endc, 10);
-		if (*endc || port_chk == 0)
-			return 0;
-		/* Ignore destination port. */
-
-		return 1;
-	}
-
-	return 0;
-}
-

 /**
 * Get the sockaddr for the client.
@@ -316,7 +159,9 @@ int read_proxy_protocol_header(int fd)
 * If it comes in as an ipv4 address mapped into IPv6 format then we
 * convert it back to a regular IPv4.
 **/
-static void client_sockaddr(int fd, struct sockaddr_storage *ss, socklen_t *ss_len)
+void client_sockaddr(int fd,
+		     struct sockaddr_storage *ss,
+		     socklen_t *ss_len)
 {
 	memset(ss, 0, sizeof *ss);

@@ -327,8 +172,8 @@ static void client_sockaddr(int fd, struct sockaddr_storage *ss, socklen_t *ss_l
 	}

 #ifdef INET6
-	if (GET_SOCKADDR_FAMILY(ss) == AF_INET6
-	 && IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)ss)->sin6_addr)) {
+	if (get_sockaddr_family(ss) == AF_INET6 &&
+	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)ss)->sin6_addr)) {
 		/* OK, so ss is in the IPv6 family, but it is really
 		 * an IPv4 address: something like
 		 * "::ffff:10.130.1.2".  If we use it as-is, then the
@@ -351,20 +196,51 @@ static void client_sockaddr(int fd, struct sockaddr_storage *ss, socklen_t *ss_l
 		/* There is a macro to extract the mapped part
 		 * (IN6_V4MAPPED_TO_SINADDR ?), but it does not seem
 		 * to be present in the Linux headers. */
-		memcpy(&sin->sin_addr, &sin6.sin6_addr.s6_addr[12], sizeof sin->sin_addr);
+		memcpy(&sin->sin_addr, &sin6.sin6_addr.s6_addr[12],
+		    sizeof sin->sin_addr);
 	}
 #endif
 }


+/**
+ * Look up a name from @p ss into @p name_buf.
+ *
+ * @param fd file descriptor for client socket.
+ **/
+int lookup_name(int fd, const struct sockaddr_storage *ss,
+		socklen_t ss_len,
+		char *name_buf, size_t name_buf_size,
+		char *port_buf, size_t port_buf_size)
+{
+	int name_err;
+
+	/* reverse lookup */
+	name_err = getnameinfo((struct sockaddr *) ss, ss_len,
+			       name_buf, name_buf_size,
+			       port_buf, port_buf_size,
+			       NI_NAMEREQD | NI_NUMERICSERV);
+	if (name_err != 0) {
+		strlcpy(name_buf, default_name, name_buf_size);
+		rprintf(FLOG, "name lookup failed for %s: %s\n",
+			client_addr(fd), gai_strerror(name_err));
+		return name_err;
+	}
+
+	return 0;
+}
+
+
+
 /**
 * Compare an addrinfo from the resolver to a sockinfo.
 *
 * Like strcmp, returns 0 for identical.
 **/
-static int compare_addrinfo_sockaddr(const struct addrinfo *ai, const struct sockaddr_storage *ss)
+int compare_addrinfo_sockaddr(const struct addrinfo *ai,
+			      const struct sockaddr_storage *ss)
 {
-	int ss_family = GET_SOCKADDR_FAMILY(ss);
+	int ss_family = get_sockaddr_family(ss);
 	const char fn[] = "compare_addrinfo_sockaddr";

 	if (ai->ai_family != ss_family) {
@@ -380,7 +256,8 @@ static int compare_addrinfo_sockaddr(const struct addrinfo *ai, const struct soc
 		sin1 = (const struct sockaddr_in *) ss;
 		sin2 = (const struct sockaddr_in *) ai->ai_addr;

-		return memcmp(&sin1->sin_addr, &sin2->sin_addr, sizeof sin1->sin_addr);
+		return memcmp(&sin1->sin_addr, &sin2->sin_addr,
+			      sizeof sin1->sin_addr);
 	}

 #ifdef INET6
@@ -390,13 +267,14 @@ static int compare_addrinfo_sockaddr(const struct addrinfo *ai, const struct soc
 		sin1 = (const struct sockaddr_in6 *) ss;
 		sin2 = (const struct sockaddr_in6 *) ai->ai_addr;

-		if (ai->ai_addrlen < (int)sizeof (struct sockaddr_in6)) {
+		if (ai->ai_addrlen < sizeof (struct sockaddr_in6)) {
 			rprintf(FLOG, "%s: too short sockaddr_in6; length=%d\n",
 				fn, (int)ai->ai_addrlen);
 			return 1;
 		}

-		if (memcmp(&sin1->sin6_addr, &sin2->sin6_addr, sizeof sin1->sin6_addr))
+		if (memcmp(&sin1->sin6_addr, &sin2->sin6_addr,
+			   sizeof sin1->sin6_addr))
 			return 1;

 #ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
@@ -422,11 +300,13 @@ static int compare_addrinfo_sockaddr(const struct addrinfo *ai, const struct soc
 * because it doesn't seem that it could be spoofed in any way, and
 * getaddrinfo on random service names seems to cause problems on AIX.
 **/
-static int check_name(const char *ipaddr, const struct sockaddr_storage *ss, char *name_buf, size_t name_buf_size)
+int check_name(int fd,
+	       const struct sockaddr_storage *ss,
+	       char *name_buf, size_t name_buf_size)
 {
 	struct addrinfo hints, *res, *res0;
 	int error;
-	int ss_family = GET_SOCKADDR_FAMILY(ss);
+	int ss_family = get_sockaddr_family(ss);

 	memset(&hints, 0, sizeof hints);
 	hints.ai_family = ss_family;
@@ -457,82 +337,10 @@ static int check_name(const char *ipaddr, const struct sockaddr_storage *ss, cha
 		/* We hit the end of the list without finding an
 		 * address that was the same as ss. */
 		rprintf(FLOG, "%s is not a known address for \"%s\": "
-			"spoofed address?\n", ipaddr, name_buf);
+			"spoofed address?\n", client_addr(fd), name_buf);
 		strlcpy(name_buf, default_name, name_buf_size);
 	}

 	freeaddrinfo(res0);
 	return 0;
 }
-
-/* Returns 1 for a valid IPv4 or IPv6 addr, or 0 for a bad one. */
-static int valid_ipaddr(const char *s, int allow_scope)
-{
-	int i;
-
-	if (strchr(s, ':') != NULL) { /* Only IPv6 has a colon. */
-		int count, saw_double_colon = 0;
-		int ipv4_at_end = 0;
-
-		if (*s == ':') { /* A colon at the start must be a :: */
-			if (*++s != ':')
-				return 0;
-			saw_double_colon = 1;
-			s++;
-		}
-
-		for (count = 0; count < 8; count++) {
-			if (!*s)
-				return saw_double_colon;
-			if (allow_scope && *s == '%') {
-				if (saw_double_colon)
-					break;
-				return 0;
-			}
-
-			if (strchr(s, ':') == NULL && strchr(s, '.') != NULL) {
-				if ((!saw_double_colon && count != 6) || (saw_double_colon && count > 6))
-					return 0;
-				ipv4_at_end = 1;
-				break;
-			}
-
-			if (!isHexDigit(s++)) /* Need 1-4 hex digits */
-				return 0;
-			if (isHexDigit(s) && isHexDigit(++s) && isHexDigit(++s) && isHexDigit(++s))
-				return 0;
-
-			if (*s == ':') {
-				if (!*++s)
-					return 0;
-				if (*s == ':') {
-					if (saw_double_colon)
-						return 0;
-					saw_double_colon = 1;
-					s++;
-				}
-			}
-		}
-
-		if (!ipv4_at_end) {
-			if (allow_scope && *s == '%')
-				for (s++; isAlNum(s); s++) { }
-			return !*s && s[-1] != '%';
-		}
-	}
-
-	/* IPv4 */
-	for (i = 0; i < 4; i++) {
-		long n;
-		char *end;
-
-		if (i && *s++ != '.')
-			return 0;
-		n = strtol(s, &end, 10);
-		if (n > 255 || n < 0 || end <= s || end > s+3)
-			return 0;
-		s = end;
-	}
-
-	return !*s;
-}
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-srcdir=`dirname $0`
-opt="$1"
-shift
-
-echo "$*"
-if ! "${@}"; then
-    echo "If you can't fix the issue, re-run $srcdir/configure with --$opt."
-    exit 1
-fi
@@ -3,7 +3,7 @@
 *
 * Copyright (C) Andrew Tridgell 1996
 * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2004-2022 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,9 +20,12 @@
 */

 #include "rsync.h"
-#include "itypes.h"
-#include "ifuncs.h"

+int remote_protocol = 0;
+int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
+int inc_recurse = 0;
+
+extern int verbose;
 extern int am_server;
 extern int am_sender;
 extern int local_server;
@@ -30,11 +33,9 @@ extern int inplace;
 extern int recurse;
 extern int use_qsort;
 extern int allow_inc_recurse;
-extern int preallocate_files;
 extern int append_mode;
 extern int fuzzy_basis;
 extern int read_batch;
-extern int write_batch;
 extern int delay_updates;
 extern int checksum_seed;
 extern int basis_dir_cnt;
@@ -43,51 +44,24 @@ extern int protocol_version;
 extern int protect_args;
 extern int preserve_uid;
 extern int preserve_gid;
-extern int preserve_atimes;
-extern int preserve_crtimes;
 extern int preserve_acls;
 extern int preserve_xattrs;
-extern int xfer_flags_as_varint;
 extern int need_messages_from_generator;
 extern int delete_mode, delete_before, delete_during, delete_after;
-extern int do_compression;
-extern int do_compression_level;
-extern int do_compression_threads;
-extern int saw_stderr_opt;
-extern int msgs2stderr;
 extern char *shell_cmd;
 extern char *partial_dir;
+extern char *dest_option;
 extern char *files_from;
 extern char *filesfrom_host;
-extern const char *checksum_choice;
-extern const char *compress_choice;
-extern char *daemon_auth_choices;
-extern filter_rule_list filter_list;
+extern struct filter_list_struct filter_list;
 extern int need_unsorted_flist;
 #ifdef ICONV_OPTION
 extern iconv_t ic_send, ic_recv;
 extern char *iconv_opt;
 #endif
-extern struct name_num_obj valid_checksums, valid_auth_checksums;
-
-extern struct name_num_item *xfer_sum_nni;
-
-int remote_protocol = 0;
-int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
-int inc_recurse = 0;
-int compat_flags = 0;
-int use_safe_inc_flist = 0;
-int want_xattr_optim = 0;
-int proper_seed_order = 0;
-int inplace_partial = 0;
-int do_negotiated_strings = 0;
-int xmit_id0_names = 0;
-
-struct name_num_item *xattr_sum_nni;
-int xattr_sum_len = 0;

 /* These index values are for the file-list's extra-attribute array. */
-int pathname_ndx, depth_ndx, atimes_ndx, crtimes_ndx, uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;

 int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
 int sender_symlink_iconv = 0;	/* sender should convert symlink content */
@@ -96,34 +70,9 @@ int sender_symlink_iconv = 0;	/* sender should convert symlink content */
 int filesfrom_convert = 0;
 #endif

-#define MAX_NSTR_STRLEN 256
-
-struct name_num_item valid_compressions_items[] = {
-#ifdef SUPPORT_ZSTD
-	{ CPRES_ZSTD, 0, "zstd", NULL },
-#endif
-#ifdef SUPPORT_LZ4
-	{ CPRES_LZ4, 0, "lz4", NULL },
-#endif
-	{ CPRES_ZLIBX, 0, "zlibx", NULL },
-	{ CPRES_ZLIB, 0, "zlib", NULL },
-	{ CPRES_NONE, 0, "none", NULL },
-	{ 0, 0, NULL, NULL }
-};
-
-struct name_num_obj valid_compressions = {
-	"compress", NULL, 0, 0, valid_compressions_items
-};
-
 #define CF_INC_RECURSE	 (1<<0)
 #define CF_SYMLINK_TIMES (1<<1)
 #define CF_SYMLINK_ICONV (1<<2)
-#define CF_SAFE_FLIST	 (1<<3)
-#define CF_AVOID_XATTR_OPTIM (1<<4)
-#define CF_CHKSUM_SEED_FIX (1<<5)
-#define CF_INPLACE_PARTIAL_DIR (1<<6)
-#define CF_VARINT_FLIST_FLAGS (1<<7)
-#define CF_ID0_NAMES (1<<8)

 static const char *client_info;

@@ -132,9 +81,13 @@ static const char *client_info;
 * of that protocol for it to be advertised as available. */
 static void check_sub_protocol(void)
 {
-	const char *dot;
+	char *dot;
 	int their_protocol, their_sub;
-	int our_sub = get_subprotocol_version();
+#if SUBPROTOCOL_VERSION != 0
+	int our_sub = protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION;
+#else
+	int our_sub = 0;
+#endif

 	/* client_info starts with VER.SUB string if client is a pre-release. */
 	if (!(their_protocol = atoi(client_info))
@@ -161,13 +114,7 @@ static void check_sub_protocol(void)

 void set_allow_inc_recurse(void)
 {
-	if (!local_server)
-		client_info = shell_cmd ? shell_cmd : "";
-	else if (am_server) {
-		char buf[64];
-		maybe_add_e_option(buf, sizeof buf);
-		client_info = *buf ? strdup(buf+1) : ""; /* The +1 skips the leading "e". */
-	}
+	client_info = shell_cmd ? shell_cmd : "";

 	if (!recurse || use_qsort)
 		allow_inc_recurse = 0;
@@ -175,426 +122,25 @@ void set_allow_inc_recurse(void)
 	 && (delete_before || delete_after
 	  || delay_updates || prune_empty_dirs))
 		allow_inc_recurse = 0;
-	else if (am_server && strchr(client_info, 'i') == NULL)
+	else if (am_server && !local_server
+	 && (strchr(client_info, 'i') == NULL))
 		allow_inc_recurse = 0;
 }

-void parse_compress_choice(int final_call)
-{
-	if (valid_compressions.negotiated_nni)
-		do_compression = valid_compressions.negotiated_nni->num;
-	else if (compress_choice) {
-		struct name_num_item *nni = get_nni_by_name(&valid_compressions, compress_choice, -1);
-		if (!nni) {
-			rprintf(FERROR, "unknown compress name: %s\n", compress_choice);
-			exit_cleanup(RERR_UNSUPPORTED);
-		}
-		do_compression = nni->num;
-		if (am_server)
-			validate_choice_vs_env(NSTR_COMPRESS, do_compression, -1);
-	} else if (do_compression)
-		do_compression = CPRES_ZLIB;
-	else
-		do_compression = CPRES_NONE;
-
-	if (do_compression != CPRES_NONE && final_call)
-		init_compression_level(); /* There's a chance this might turn compression off! */
-
-	if (do_compression == CPRES_NONE)
-		compress_choice = NULL;
-
-	/* Snag the compression name for both write_batch's option output & the following debug output. */
-	if (valid_compressions.negotiated_nni)
-		compress_choice = valid_compressions.negotiated_nni->name;
-	else if (compress_choice == NULL) {
-		struct name_num_item *nni = get_nni_by_num(&valid_compressions, do_compression);
-		compress_choice = nni ? nni->name : "UNKNOWN";
-	}
-
-	if (final_call && DEBUG_GTE(NSTR, am_server ? 3 : 1)
-	 && (do_compression != CPRES_NONE || do_compression_level != CLVL_NOT_SPECIFIED)) {
-		rprintf(FINFO, "%s%s compress: %s (level %d)\n",
-			am_server ? "Server" : "Client",
-			valid_compressions.negotiated_nni ? " negotiated" : "",
-			compress_choice, do_compression_level);
-	}
-}
-
-struct name_num_item *get_nni_by_name(struct name_num_obj *nno, const char *name, int len)
-{
-	struct name_num_item *nni;
-
-	if (len < 0)
-		len = strlen(name);
-
-	for (nni = nno->list; nni->name; nni++) {
-		if (nni->num == CSUM_gone)
-			continue;
-		if (strncasecmp(name, nni->name, len) == 0 && nni->name[len] == '\0')
-			return nni;
-	}
-
-	return NULL;
-}
-
-struct name_num_item *get_nni_by_num(struct name_num_obj *nno, int num)
-{
-	struct name_num_item *nni;
-
-	for (nni = nno->list; nni->name; nni++) {
-		if (num == nni->num)
-			return nni;
-	}
-
-	return NULL;
-}
-
-static void init_nno_saw(struct name_num_obj *nno, int val)
-{
-	struct name_num_item *nni;
-	int cnt;
-
-	if (!nno->saw_len) {
-		for (nni = nno->list; nni->name; nni++) {
-			if (nni->num >= nno->saw_len)
-				nno->saw_len = nni->num + 1;
-		}
-	}
-
-	if (!nno->saw) {
-		nno->saw = new_array0(uchar, nno->saw_len);
-
-		/* We'll take this opportunity to set the main_nni values for duplicates. */
-		for (cnt = 1, nni = nno->list; nni->name; nni++, cnt++) {
-			if (nni->num == CSUM_gone)
-				continue;
-			if (nno->saw[nni->num])
-				nni->main_nni = &nno->list[nno->saw[nni->num]-1];
-			else
-				nno->saw[nni->num] = cnt;
-		}
-	}
-
-	memset(nno->saw, val, nno->saw_len);
-}
-
-/* Simplify the user-provided string so that it contains valid names without any duplicates.
- * It also sets the "saw" flags to a 1-relative count of which name was seen first. */
-static int parse_nni_str(struct name_num_obj *nno, const char *from, char *tobuf, int tobuf_len)
-{
-	char *to = tobuf, *tok = NULL;
-	int saw_tok = 0, cnt = 0;
-
-	while (1) {
-		int at_space = isSpace(from);
-		char ch = *from++;
-		if (ch == '&')
-			ch = '\0';
-		if (!ch || at_space) {
-			if (tok) {
-				struct name_num_item *nni = get_nni_by_name(nno, tok, to - tok);
-				if (nni && !nno->saw[nni->num]) {
-					nno->saw[nni->num] = ++cnt;
-					if (nni->main_nni) {
-						to = tok + strlcpy(tok, nni->main_nni->name, tobuf_len - (tok - tobuf));
-						if (to - tobuf >= tobuf_len) {
-							to = tok - 1;
-							break;
-						}
-					}
-				} else
-					to = tok - (tok != tobuf);
-				saw_tok = 1;
-				tok = NULL;
-			}
-			if (!ch)
-				break;
-			continue;
-		}
-		if (!tok) {
-			if (to != tobuf)
-				*to++ = ' ';
-			tok = to;
-		}
-		if (to - tobuf >= tobuf_len - 1) {
-			to = tok - (tok != tobuf);
-			break;
-		}
-		*to++ = ch;
-	}
-	*to = '\0';
-
-	if (saw_tok && to == tobuf)
-		return strlcpy(tobuf, "INVALID", MAX_NSTR_STRLEN);
-
-	return to - tobuf;
-}
-
-static int parse_negotiate_str(struct name_num_obj *nno, char *tmpbuf)
-{
-	struct name_num_item *nni, *ret = NULL;
-	int best = nno->saw_len; /* We want best == 1 from the client list, so start with a big number. */
-	char *space, *tok = tmpbuf;
-	while (tok) {
-		while (*tok == ' ') tok++; /* Should be unneeded... */
-		if (!*tok)
-			break;
-		if ((space = strchr(tok, ' ')) != NULL)
-			*space = '\0';
-		nni = get_nni_by_name(nno, tok, -1);
-		if (space) {
-			*space = ' ';
-			tok = space + 1;
-		} else
-			tok = NULL;
-		if (!nni || !nno->saw[nni->num] || best <= nno->saw[nni->num])
-			continue;
-		ret = nni;
-		best = nno->saw[nni->num];
-		if (best == 1) /* Can't improve on our own #1 preference */
-			break;
-	}
-	if (ret) {
-		free(nno->saw);
-		nno->saw = NULL;
-		nno->negotiated_nni = ret->main_nni ? ret->main_nni : ret;
-		return 1;
-	}
-	return 0;
-}
-
-/* This routine is always called with a tmpbuf of MAX_NSTR_STRLEN length, but the
- * buffer may be pre-populated with a "len" length string to use OR a len of -1
- * to tell us to read a string from the fd. */
-static void recv_negotiate_str(int f_in, struct name_num_obj *nno, char *tmpbuf, int len)
-{
-	if (len < 0)
-		len = read_vstring(f_in, tmpbuf, MAX_NSTR_STRLEN);
-
-	if (DEBUG_GTE(NSTR, am_server ? 3 : 2)) {
-		if (am_server)
-			rprintf(FINFO, "Client %s list (on server): %s\n", nno->type, tmpbuf);
-		else
-			rprintf(FINFO, "Server %s list (on client): %s\n", nno->type, tmpbuf);
-	}
-
-	if (len > 0 && parse_negotiate_str(nno, tmpbuf))
-		return;
-
-	if (!am_server || !do_negotiated_strings) {
-		char *cp = tmpbuf;
-		int j;
-		rprintf(FERROR, "Failed to negotiate a %s choice.\n", nno->type);
-		rprintf(FERROR, "%s list: %s\n", am_server ? "Client" : "Server", tmpbuf);
-		/* Recreate our original list from the saw values. This can't overflow our huge
-		 * buffer because we don't have enough valid entries to get anywhere close. */
-		for (j = 1, *cp = '\0'; j <= nno->saw_len; j++) {
-			struct name_num_item *nni;
-			for (nni = nno->list; nni->name; nni++) {
-				if (nno->saw[nni->num] == j) {
-					*cp++ = ' ';
-					cp += strlcpy(cp, nni->name, MAX_NSTR_STRLEN - (cp - tmpbuf));
-					break;
-				}
-			}
-		}
-		if (!*tmpbuf)
-			strlcpy(cp, " INVALID", MAX_NSTR_STRLEN);
-		rprintf(FERROR, "%s list:%s\n", am_server ? "Server" : "Client", tmpbuf);
-	}
-
-	exit_cleanup(RERR_UNSUPPORTED);
-}
-
-static const char *getenv_nstr(int ntype)
-{
-	const char *env_str = getenv(ntype == NSTR_COMPRESS ? "RSYNC_COMPRESS_LIST" : "RSYNC_CHECKSUM_LIST");
-
-	/* When writing a batch file, we always negotiate an old-style choice. */
-	if (write_batch)
-		env_str = ntype == NSTR_COMPRESS ? "zlib" : protocol_version >= 30 ? "md5" : "md4";
-
-	if (am_server && env_str) {
-		const char *cp = strchr(env_str, '&');
-		if (cp)
-			env_str = cp + 1;
-	}
-
-	return env_str;
-}
-
-void validate_choice_vs_env(int ntype, int num1, int num2)
-{
-	struct name_num_obj *nno = ntype == NSTR_COMPRESS ? &valid_compressions : &valid_checksums;
-	const char *list_str = getenv_nstr(ntype);
-	char tmpbuf[MAX_NSTR_STRLEN];
-
-	if (!list_str)
-		return;
-
-	while (isSpace(list_str)) list_str++;
-
-	if (!*list_str)
-		return;
-
-	init_nno_saw(nno, 0);
-	parse_nni_str(nno, list_str, tmpbuf, MAX_NSTR_STRLEN);
-
-	if (ntype == NSTR_CHECKSUM) /* If "md4" is in the env list, all the old MD4 choices are OK too. */
-		nno->saw[CSUM_MD4_ARCHAIC] = nno->saw[CSUM_MD4_BUSTED] = nno->saw[CSUM_MD4_OLD] = nno->saw[CSUM_MD4];
-
-	if (!nno->saw[num1] || (num2 >= 0 && !nno->saw[num2])) {
-		rprintf(FERROR, "Your --%s-choice value (%s) was refused by the server.\n",
-			ntype == NSTR_COMPRESS ? "compress" : "checksum",
-			ntype == NSTR_COMPRESS ? compress_choice : checksum_choice);
-		exit_cleanup(RERR_UNSUPPORTED);
-	}
-
-	free(nno->saw);
-	nno->saw = NULL;
-}
-
-/* The saw buffer is initialized and used to store ordinal values from 1 to N
- * for the order of the args in the array.  If dup_markup == '\0', duplicates
- * are removed otherwise the char is prefixed to the duplicate term and, if it
- * is an opening paren/bracket/brace, the matching closing char is suffixed.
- * "none" is removed on the client side unless dup_markup != '\0'. */
-int get_default_nno_list(struct name_num_obj *nno, char *to_buf, int to_buf_len, char dup_markup)
-{
-	struct name_num_item *nni;
-	int len = 0, cnt = 0;
-	char delim = '\0', post_delim;
-
-	switch (dup_markup) {
-	case '(': post_delim = ')'; break;
-	case '[': post_delim = ']'; break;
-	case '{': post_delim = '}'; break;
-	default: post_delim = '\0'; break;
-	}
-
-	init_nno_saw(nno, 0);
-
-	for (nni = nno->list, len = 0; nni->name; nni++) {
-		if (nni->num == CSUM_gone)
-			continue;
-		if (nni->main_nni) {
-			if (!dup_markup || nni->main_nni->num == CSUM_gone)
-				continue;
-			delim = dup_markup;
-		}
-		if (nni->num == 0 && !am_server && !dup_markup)
-			continue;
-		if (len)
-			to_buf[len++]= ' ';
-		if (delim) {
-			to_buf[len++]= delim;
-			delim = post_delim;
-		}
-		len += strlcpy(to_buf+len, nni->name, to_buf_len - len);
-		if (len >= to_buf_len - 3)
-			exit_cleanup(RERR_UNSUPPORTED); /* IMPOSSIBLE... */
-		if (delim) {
-			to_buf[len++]= delim;
-			delim = '\0';
-		}
-		nno->saw[nni->num] = ++cnt;
-	}
-
-	return len;
-}
-
-static void send_negotiate_str(int f_out, struct name_num_obj *nno, int ntype)
-{
-	char tmpbuf[MAX_NSTR_STRLEN];
-	const char *list_str = getenv_nstr(ntype);
-	int len;
-
-	if (list_str && *list_str) {
-		init_nno_saw(nno, 0);
-		len = parse_nni_str(nno, list_str, tmpbuf, MAX_NSTR_STRLEN);
-		list_str = tmpbuf;
-	} else
-		list_str = NULL;
-
-	if (!list_str || !*list_str)
-		len = get_default_nno_list(nno, tmpbuf, MAX_NSTR_STRLEN, '\0');
-
-	if (DEBUG_GTE(NSTR, am_server ? 3 : 2)) {
-		if (am_server)
-			rprintf(FINFO, "Server %s list (on server): %s\n", nno->type, tmpbuf);
-		else
-			rprintf(FINFO, "Client %s list (on client): %s\n", nno->type, tmpbuf);
-	}
-
-	/* Each side sends their list of valid names to the other side and then each
-	 * side picks its own most-preferred name that also appears in the peer's
-	 * list.  Honest peers emit their list in table (strongest-first) order via
-	 * get_default_nno_list(), so both sides converge on the strongest mutual
-	 * choice; a peer that front-loads a weaker name only desyncs itself. */
-	if (do_negotiated_strings)
-		write_vstring(f_out, tmpbuf, len);
-}
-
-static void negotiate_the_strings(int f_in, int f_out)
-{
-	/* We send all the negotiation strings before we start to read them to help avoid a slow startup. */
-
-	init_checksum_choices();
-
-	if (!checksum_choice)
-		send_negotiate_str(f_out, &valid_checksums, NSTR_CHECKSUM);
-
-	if (do_compression && !compress_choice)
-		send_negotiate_str(f_out, &valid_compressions, NSTR_COMPRESS);
-
-	if (valid_checksums.saw) {
-		char tmpbuf[MAX_NSTR_STRLEN];
-		int len;
-		if (do_negotiated_strings)
-			len = -1;
-		else
-			len = strlcpy(tmpbuf, protocol_version >= 30 ? "md5" : "md4", MAX_NSTR_STRLEN);
-		recv_negotiate_str(f_in, &valid_checksums, tmpbuf, len);
-	}
-
-	if (valid_compressions.saw) {
-		char tmpbuf[MAX_NSTR_STRLEN];
-		int len;
-		if (do_negotiated_strings)
-			len = -1;
-		else
-			len = strlcpy(tmpbuf, "zlib", MAX_NSTR_STRLEN);
-		recv_negotiate_str(f_in, &valid_compressions, tmpbuf, len);
-	}
-
-	/* If the other side is too old to negotiate, the above steps just made sure that
-	 * the env didn't disallow the old algorithm. Mark things as non-negotiated. */
-	if (!do_negotiated_strings)
-		valid_checksums.negotiated_nni = valid_compressions.negotiated_nni = NULL;
-}
-
 void setup_protocol(int f_out,int f_in)
 {
-	assert(file_extra_cnt == 0);
-	assert(EXTRA64_CNT == 2 || EXTRA64_CNT == 1);
-
-	/* All int64 values must be set first so that they are guaranteed to be
-	 * aligned for direct int64-pointer memory access. */
-	if (preserve_atimes)
-		atimes_ndx = (file_extra_cnt += EXTRA64_CNT);
-	if (preserve_crtimes)
-		crtimes_ndx = (file_extra_cnt += EXTRA64_CNT);
-	if (am_sender) /* This is most likely in the file_extras64 union as well. */
-		pathname_ndx = (file_extra_cnt += PTR_EXTRA_CNT);
+	if (am_sender)
+		file_extra_cnt += PTR_EXTRA_CNT;
 	else
-		depth_ndx = ++file_extra_cnt;
-	/* uid_ndx/gid_ndx/acls_ndx/xattrs_ndx are assigned AFTER
-	 * check_batch_flags() below: a batch file's stream-flags can flip
-	 * preserve_uid/gid/acls/xattrs on, and computing the *_ndx slots
-	 * before that leaves e.g. preserve_xattrs=1 with xattrs_ndx=0 -- so
-	 * F_XATTR(file) (= REQ_EXTRA(file, 0)) writes at offset 0 of every
-	 * file_struct, clobbering file->dirname.  Nothing between here and
-	 * check_batch_flags() reads file_extra_cnt or the *_ndx values. */
+		file_extra_cnt++;
+	if (preserve_uid)
+		uid_ndx = ++file_extra_cnt;
+	if (preserve_gid)
+		gid_ndx = ++file_extra_cnt;
+	if (preserve_acls && !am_sender)
+		acls_ndx = ++file_extra_cnt;
+	if (preserve_xattrs)
+		xattrs_ndx = ++file_extra_cnt;

 	if (am_server)
 		set_allow_inc_recurse();
@@ -614,14 +160,14 @@ void setup_protocol(int f_out,int f_in)
 		exit_cleanup(RERR_PROTOCOL);
 	}

-	if (DEBUG_GTE(PROTO, 1)) {
+	if (verbose > 3) {
 		rprintf(FINFO, "(%s) Protocol versions: remote=%d, negotiated=%d\n",
 			am_server? "Server" : "Client", remote_protocol, protocol_version);
 	}
 	if (remote_protocol < MIN_PROTOCOL_VERSION
 	 || remote_protocol > MAX_PROTOCOL_VERSION) {
 		rprintf(FERROR,"protocol version mismatch -- is your shell clean?\n");
-		rprintf(FERROR,"(see the rsync manpage for an explanation)\n");
+		rprintf(FERROR,"(see the rsync man page for an explanation)\n");
 		exit_cleanup(RERR_PROTOCOL);
 	}
 	if (remote_protocol < OLD_PROTOCOL_VERSION) {
@@ -641,41 +187,21 @@ void setup_protocol(int f_out,int f_in)
 	if (read_batch)
 		check_batch_flags();

-	if (preserve_uid)
-		uid_ndx = ++file_extra_cnt;
-	if (preserve_gid)
-		gid_ndx = ++file_extra_cnt;
-	if (preserve_acls && !am_sender)
-		acls_ndx = ++file_extra_cnt;
-	if (preserve_xattrs)
-		xattrs_ndx = ++file_extra_cnt;
-
-	if (!saw_stderr_opt && protocol_version <= 28 && am_server)
-		msgs2stderr = 0; /* The client side may not have stderr setup for us. */
-
-#ifndef SUPPORT_PREALLOCATION
-	if (preallocate_files && !am_sender) {
-		rprintf(FERROR, "preallocation is not supported on this %s\n",
-			am_server ? "Server" : "Client");
-		exit_cleanup(RERR_SYNTAX);
-	}
-#endif
-
 	if (protocol_version < 30) {
 		if (append_mode == 1)
 			append_mode = 2;
 		if (preserve_acls && !local_server) {
 			rprintf(FERROR,
-				"--acls requires protocol 30 or higher"
-				" (negotiated %d).\n",
-				protocol_version);
+			    "--acls requires protocol 30 or higher"
+			    " (negotiated %d).\n",
+			    protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}
 		if (preserve_xattrs && !local_server) {
 			rprintf(FERROR,
-				"--xattrs requires protocol 30 or higher"
-				" (negotiated %d).\n",
-				protocol_version);
+			    "--xattrs requires protocol 30 or higher"
+			    " (negotiated %d).\n",
+			    protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}
 	}
@@ -690,85 +216,56 @@ void setup_protocol(int f_out,int f_in)
 	if (protocol_version < 29) {
 		if (fuzzy_basis) {
 			rprintf(FERROR,
-				"--fuzzy requires protocol 29 or higher"
-				" (negotiated %d).\n",
-				protocol_version);
+			    "--fuzzy requires protocol 29 or higher"
+			    " (negotiated %d).\n",
+			    protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}

 		if (basis_dir_cnt && inplace) {
 			rprintf(FERROR,
-				"%s with --inplace requires protocol 29 or higher"
-				" (negotiated %d).\n",
-				alt_dest_opt(0), protocol_version);
+			    "%s with --inplace requires protocol 29 or higher"
+			    " (negotiated %d).\n",
+			    dest_option, protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}

 		if (basis_dir_cnt > 1) {
 			rprintf(FERROR,
-				"Using more than one %s option requires protocol"
-				" 29 or higher (negotiated %d).\n",
-				alt_dest_opt(0), protocol_version);
+			    "Using more than one %s option requires protocol"
+			    " 29 or higher (negotiated %d).\n",
+			    dest_option, protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}

 		if (prune_empty_dirs) {
 			rprintf(FERROR,
-				"--prune-empty-dirs requires protocol 29 or higher"
-				" (negotiated %d).\n",
-				protocol_version);
+			    "--prune-empty-dirs requires protocol 29 or higher"
+			    " (negotiated %d).\n",
+			    protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}
 	} else if (protocol_version >= 30) {
+		int compat_flags;
 		if (am_server) {
 			compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0;
-#ifdef CAN_SET_SYMLINK_TIMES
+#if defined HAVE_LUTIMES && defined HAVE_UTIMES
 			compat_flags |= CF_SYMLINK_TIMES;
 #endif
 #ifdef ICONV_OPTION
 			compat_flags |= CF_SYMLINK_ICONV;
 #endif
-			if (strchr(client_info, 'f') != NULL)
-				compat_flags |= CF_SAFE_FLIST;
-			if (strchr(client_info, 'x') != NULL)
-				compat_flags |= CF_AVOID_XATTR_OPTIM;
-			if (strchr(client_info, 'C') != NULL)
-				compat_flags |= CF_CHKSUM_SEED_FIX;
-			if (strchr(client_info, 'I') != NULL)
-				compat_flags |= CF_INPLACE_PARTIAL_DIR;
-			if (strchr(client_info, 'u') != NULL)
-				compat_flags |= CF_ID0_NAMES;
-			if (strchr(client_info, 'v') != NULL) {
-				do_negotiated_strings = 1;
-				compat_flags |= CF_VARINT_FLIST_FLAGS;
-			}
-			if (strchr(client_info, 'V') != NULL) { /* Support a pre-release 'V' that got superseded */
-				if (!write_batch)
-					compat_flags |= CF_VARINT_FLIST_FLAGS;
-				write_byte(f_out, compat_flags);
-			} else
-				write_varint(f_out, compat_flags);
-		} else { /* read_varint() is compatible with the older write_byte() when the 0x80 bit isn't on. */
-			compat_flags = read_varint(f_in);
-			if  (compat_flags & CF_VARINT_FLIST_FLAGS)
-				do_negotiated_strings = 1;
-		}
+			write_byte(f_out, compat_flags);
+		} else
+			compat_flags = read_byte(f_in);
 		/* The inc_recurse var MUST be set to 0 or 1. */
 		inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0;
-		want_xattr_optim = protocol_version >= 31 && !(compat_flags & CF_AVOID_XATTR_OPTIM);
-		proper_seed_order = compat_flags & CF_CHKSUM_SEED_FIX ? 1 : 0;
-		xfer_flags_as_varint = compat_flags & CF_VARINT_FLIST_FLAGS ? 1 : 0;
-		xmit_id0_names = compat_flags & CF_ID0_NAMES ? 1 : 0;
-		if (!xfer_flags_as_varint && preserve_crtimes) {
-			fprintf(stderr, "Both rsync versions must be at least 3.2.0 for --crtimes.\n");
-			exit_cleanup(RERR_PROTOCOL);
-		}
 		if (am_sender) {
 			receiver_symlink_times = am_server
 			    ? strchr(client_info, 'L') != NULL
 			    : !!(compat_flags & CF_SYMLINK_TIMES);
 		}
-#ifdef CAN_SET_SYMLINK_TIMES
+#if defined HAVE_LUTIMES && defined HAVE_UTIMES
 		else
 			receiver_symlink_times = 1;
 #endif
@@ -780,31 +277,25 @@ void setup_protocol(int f_out,int f_in)
 		if (inc_recurse && !allow_inc_recurse) {
 			/* This should only be able to happen in a batch. */
 			fprintf(stderr,
-				"Incompatible options specified for inc-recursive %s.\n",
-				read_batch ? "batch file" : "connection");
+			    "Incompatible options specified for inc-recursive %s.\n",
+			    read_batch ? "batch file" : "connection");
 			exit_cleanup(RERR_SYNTAX);
 		}
-		use_safe_inc_flist = (compat_flags & CF_SAFE_FLIST) || protocol_version >= 31;
 		need_messages_from_generator = 1;
-		if (compat_flags & CF_INPLACE_PARTIAL_DIR)
-			inplace_partial = 1;
-#ifdef CAN_SET_SYMLINK_TIMES
+#if defined HAVE_LUTIMES && defined HAVE_UTIMES
 	} else if (!am_sender) {
 		receiver_symlink_times = 1;
 #endif
 	}

-	if (read_batch)
-		do_negotiated_strings = 0;
-
 	if (need_unsorted_flist && (!am_sender || inc_recurse))
 		unsort_ndx = ++file_extra_cnt;

 	if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
-		int rflags = FILTRULE_NO_PREFIXES | FILTRULE_DIRECTORY;
+		int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
 		if (!am_sender || protocol_version >= 30)
-			rflags |= FILTRULE_PERISHABLE;
-		parse_filter_str(&filter_list, partial_dir, rule_template(rflags), 0);
+			flags |= MATCHFLG_PERISHABLE;
+		parse_rule(&filter_list, partial_dir, flags, 0);
 	}


@@ -817,87 +308,11 @@ void setup_protocol(int f_out,int f_in)
 	}
 #endif

-	negotiate_the_strings(f_in, f_out);
-
 	if (am_server) {
 		if (!checksum_seed)
-			checksum_seed = time(NULL) ^ (getpid() << 6);
+			checksum_seed = time(NULL);
 		write_int(f_out, checksum_seed);
 	} else {
 		checksum_seed = read_int(f_in);
 	}
-
-	parse_checksum_choice(1); /* Sets file_sum_nni & xfer_sum_nni */
-	parse_compress_choice(1); /* Sets do_compression */
-
-	/* TODO in the future allow this algorithm to be chosen somehow, but it can't get too
-	 * long or the size starts to cause a problem in the xattr abbrev/non-abbrev code. */
-	xattr_sum_nni = parse_csum_name(NULL, 0);
-	xattr_sum_len = csum_len_for_type(xattr_sum_nni->num, 0);
-
-	if (write_batch && !am_server)
-		write_batch_shell_file();
-
-	init_flist();
-}
-
-void output_daemon_greeting(int f_out, int am_client)
-{
-	char tmpbuf[MAX_NSTR_STRLEN];
-	int our_sub = get_subprotocol_version();
-
-	init_checksum_choices();
-
-	get_default_nno_list(&valid_auth_checksums, tmpbuf, MAX_NSTR_STRLEN, '\0');
-
-	io_printf(f_out, "@RSYNCD: %d.%d %s\n", protocol_version, our_sub, tmpbuf);
-
-	if (am_client && DEBUG_GTE(NSTR, 2))
-		rprintf(FINFO, "Client %s list (on client): %s\n", valid_auth_checksums.type, tmpbuf);
-}
-
-void negotiate_daemon_auth(int f_out, int am_client)
-{
-	char tmpbuf[MAX_NSTR_STRLEN];
-	int save_am_server = am_server;
-	int md4_is_old = 0;
-
-	if (!am_client)
-		am_server = 1;
-
-	if (daemon_auth_choices)
-		strlcpy(tmpbuf, daemon_auth_choices, MAX_NSTR_STRLEN);
-	else {
-		strlcpy(tmpbuf, protocol_version >= 30 ? "md5" : "md4", MAX_NSTR_STRLEN);
-		md4_is_old = 1;
-	}
-
-	if (am_client) {
-		recv_negotiate_str(-1, &valid_auth_checksums, tmpbuf, strlen(tmpbuf));
-		if (DEBUG_GTE(NSTR, 1)) {
-			rprintf(FINFO, "Client negotiated %s: %s\n", valid_auth_checksums.type,
-				valid_auth_checksums.negotiated_nni->name);
-		}
-	} else {
-		if (!parse_negotiate_str(&valid_auth_checksums, tmpbuf)) {
-			get_default_nno_list(&valid_auth_checksums, tmpbuf, MAX_NSTR_STRLEN, '\0');
-			io_printf(f_out, "@ERROR: your client does not support one of our daemon-auth checksums: %s\n",
-				  tmpbuf);
-			exit_cleanup(RERR_UNSUPPORTED);
-		}
-	}
-	am_server = save_am_server;
-	if (md4_is_old && valid_auth_checksums.negotiated_nni->num == CSUM_MD4) {
-		valid_auth_checksums.negotiated_nni->num = CSUM_MD4_OLD;
-		valid_auth_checksums.negotiated_nni->flags = 0;
-	}
-}
-
-int get_subprotocol_version()
-{
-#if SUBPROTOCOL_VERSION != 0
-	return protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION;
-#else
-	return 0;
-#endif
 }
@@ -4,24 +4,22 @@
 # then transfer control to the configure.sh script to do the real work.

 dir=`dirname $0`
-if test x"$dir" = x; then
-    dir=.
-fi
+realconfigure="$dir/configure.sh"

-if test "$dir" = '.'; then
-    branch=`packaging/prep-auto-dir` || exit 1
-    if test x"$branch" != x; then
-	cd build || exit 1
-	dir=..
+if test ! -f "$realconfigure"; then
+    if test -f "$HOME/build_farm/build_test.fns"; then
+	# Allow the build farm to grab latest files via rsync.
+	actions='build fetch'
+    else
+	actions='build'
    fi
-fi
-
-if test ! -f configure.sh; then
-    if ! "$dir/prepare-source" build; then
+    if "$dir/prepare-source" $actions; then
+	:
+    else
 	echo 'Failed to build configure.sh and/or config.h.in -- giving up.' >&2
-	rm -f configure.sh
+	rm -f "$realconfigure"
 	exit 1
    fi
 fi

-exec ./configure.sh --srcdir="$dir" "${@}"
+exec "$realconfigure" "${@}"
@@ -0,0 +1,983 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT()
+AC_CONFIG_SRCDIR([byteorder.h])
+AC_CONFIG_HEADER(config.h)
+AC_PREREQ(2.59)
+
+RSYNC_VERSION=3.0.5
+AC_SUBST(RSYNC_VERSION)
+AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
+
+AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version])
+
+LDFLAGS=${LDFLAGS-""}
+
+AC_CANONICAL_TARGET([])
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_EGREP
+AC_PROG_INSTALL
+AC_PROG_CC_STDC
+AC_SUBST(SHELL)
+
+AC_DEFINE([_GNU_SOURCE], 1,
+          [Define _GNU_SOURCE so that we get all necessary prototypes])
+
+if test x"$ac_cv_prog_cc_stdc" = x"no"; then
+	AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one])
+fi
+
+# We must decide this before testing the compiler.
+
+# Please allow this to default to yes, so that your users have more
+# chance of getting a useful stack trace if problems occur.
+
+AC_MSG_CHECKING([whether to include debugging symbols])
+AC_ARG_ENABLE(debug,
+	AC_HELP_STRING([--disable-debug],
+		[disable debugging symbols and features]))
+
+if test x"$enable_debug" = x"no"; then
+    AC_MSG_RESULT(no)
+    CFLAGS=${CFLAGS-"-O"}
+else
+    AC_MSG_RESULT([yes])
+    # leave CFLAGS alone; AC_PROG_CC will try to include -g if it can
+    dnl AC_DEFINE(DEBUG, 1, [Define to turn on debugging code that may slow normal operation])
+    dnl CFLAGS=${CFLAGS-"-g"}
+fi
+
+
+AC_ARG_ENABLE(profile,
+	AC_HELP_STRING([--enable-profile],
+		[turn on CPU profiling]))
+if test x"$enable_profile" = x"yes"; then
+	CFLAGS="$CFLAGS -pg"
+fi
+
+
+# Specifically, this turns on panic_action handling.
+AC_ARG_ENABLE(maintainer-mode,
+	AC_HELP_STRING([--enable-maintainer-mode],
+		[turn on extra debug features]))
+if test x"$enable_maintainer_mode" = x"yes"; then
+	CFLAGS="$CFLAGS -DMAINTAINER_MODE"
+fi
+
+
+# This is needed for our included version of popt.  Kind of silly, but
+# I don't want our version too far out of sync.
+CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+
+# If GCC, turn on warnings.
+if test x"$GCC" = x"yes"; then
+	CFLAGS="$CFLAGS -Wall -W"
+fi
+
+AC_ARG_WITH(included-popt,
+        AC_HELP_STRING([--with-included-popt], [use bundled popt library, not from system]))
+
+AC_ARG_WITH(rsync-path,
+	AC_HELP_STRING([--with-rsync-path=PATH], [set default --rsync-path to PATH (default: rsync)]),
+	[ RSYNC_PATH="$with_rsync_path" ],
+	[ RSYNC_PATH="rsync" ])
+
+AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
+
+AC_ARG_WITH(rsyncd-conf,
+	AC_HELP_STRING([--with-rsyncd-conf=PATH], [set configuration file for rsync server to PATH (default: /etc/rsyncd.conf)]),
+	[ if test ! -z "$with_rsyncd_conf" ; then
+		case $with_rsyncd_conf in
+			yes|no)
+				RSYNCD_SYSCONF="/etc/rsyncd.conf"
+				;;
+			/*)
+				RSYNCD_SYSCONF="$with_rsyncd_conf"
+				;;
+			*)
+                                AC_MSG_ERROR(You must specify an absolute path to --with-rsyncd-conf=PATH)
+				;;
+		esac
+	else
+		RSYNCD_SYSCONF="/etc/rsyncd.conf"
+	fi ],
+	[ RSYNCD_SYSCONF="/etc/rsyncd.conf" ])
+
+AC_DEFINE_UNQUOTED(RSYNCD_SYSCONF, "$RSYNCD_SYSCONF", [location of configuration file for rsync server])
+
+AC_ARG_WITH(rsh,
+	AC_HELP_STRING([--with-rsh=CMD], [set remote shell command to CMD (default: ssh)]))
+
+AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)
+if test x$HAVE_REMSH = x1; then
+	AC_DEFINE(HAVE_REMSH, 1, [Define to 1 if remote shell is remsh, not rsh])
+fi
+
+if test x"$with_rsh" != x; then
+	RSYNC_RSH="$with_rsh"
+else
+	RSYNC_RSH="ssh"
+fi
+AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default -e command])
+
+AC_CHECK_PROG(HAVE_YODL2MAN, yodl2man, 1, 0)
+if test x$HAVE_YODL2MAN = x1; then
+    MAKE_MAN=man
+fi
+
+AC_ARG_WITH(nobody-group,
+    AC_HELP_STRING([--with-nobody-group=GROUP],
+		   [set the default unprivileged group (default nobody or nogroup)]),
+    [ NOBODY_GROUP="$with_nobody_group" ])
+
+if test x"$with_nobody_group" = x; then
+    AC_MSG_CHECKING([the group for user "nobody"])
+    if grep '^nobody:' /etc/group >/dev/null 2>&1; then
+	NOBODY_GROUP=nobody
+    elif grep '^nogroup:' /etc/group >/dev/null 2>&1; then
+	NOBODY_GROUP=nogroup
+    else
+	NOBODY_GROUP=nobody # test for others?
+    fi
+    AC_MSG_RESULT($NOBODY_GROUP)
+fi
+
+AC_DEFINE_UNQUOTED(NOBODY_USER, "nobody", [unprivileged user--e.g. nobody])
+AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unprivileged group for unprivileged user])
+
+# arrgh. libc in some old debian version screwed up the largefile
+# stuff, getting byte range locking wrong
+AC_CACHE_CHECK([for broken largefile support],rsync_cv_HAVE_BROKEN_LARGEFILE,[
+AC_TRY_RUN([
+#define _FILE_OFFSET_BITS 64
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+int main(void)
+{
+	struct flock lock;
+	int status;
+	char tpl[32] = "/tmp/locktest.XXXXXX";
+	int fd = mkstemp(tpl);
+	if (fd < 0) {
+		strcpy(tpl, "conftest.dat");
+		fd = open(tpl, O_CREAT|O_RDWR, 0600);
+	}
+
+	lock.l_type = F_WRLCK;
+	lock.l_whence = SEEK_SET;
+	lock.l_start = 0;
+	lock.l_len = 1;
+	lock.l_pid = 0;
+	fcntl(fd,F_SETLK,&lock);
+	if (fork() == 0) {
+		lock.l_start = 1;
+		_exit(fcntl(fd,F_SETLK,&lock) == 0);
+	}
+	wait(&status);
+	unlink(tpl);
+	exit(WEXITSTATUS(status));
+}
+],
+rsync_cv_HAVE_BROKEN_LARGEFILE=yes,rsync_cv_HAVE_BROKEN_LARGEFILE=no,rsync_cv_HAVE_BROKEN_LARGEFILE=cross)])
+if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then
+   AC_SYS_LARGEFILE
+fi
+
+ipv6type=unknown
+ipv6lib=none
+ipv6trylibc=yes
+
+AC_ARG_ENABLE(ipv6,
+	AC_HELP_STRING([--disable-ipv6],
+		[don't even try to use IPv6]))
+if test x"$enable_ipv6" != x"no"; then
+	AC_MSG_CHECKING([ipv6 stack type])
+	for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do
+		case $i in
+		inria)
+			# http://www.kame.net/
+			AC_EGREP_CPP(yes, [
+#include <netinet/in.h>
+#ifdef IPV6_INRIA_VERSION
+yes
+#endif],
+				[ipv6type=$i;
+				AC_DEFINE(INET6, 1, [true if you have IPv6])
+				])
+			;;
+		kame)
+			# http://www.kame.net/
+			AC_EGREP_CPP(yes, [
+#include <netinet/in.h>
+#ifdef __KAME__
+yes
+#endif],
+				[ipv6type=$i;
+				AC_DEFINE(INET6, 1, [true if you have IPv6])])
+			;;
+		linux-glibc)
+			# http://www.v6.linux.or.jp/
+			AC_EGREP_CPP(yes, [
+#include <features.h>
+#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+yes
+#endif],
+				[ipv6type=$i;
+AC_DEFINE(INET6, 1, [true if you have IPv6])])
+			;;
+		linux-inet6)
+			# http://www.v6.linux.or.jp/
+			if test -d /usr/inet6 -o -f /usr/inet6/lib/libinet6.a; then
+				ipv6type=$i
+				ipv6lib=inet6
+				ipv6libdir=/usr/inet6/lib
+				ipv6trylibc=yes;
+				AC_DEFINE(INET6, 1, [true if you have IPv6])
+				CFLAGS="-I/usr/inet6/include $CFLAGS"
+			fi
+			;;
+		toshiba)
+			AC_EGREP_CPP(yes, [
+#include <sys/param.h>
+#ifdef _TOSHIBA_INET6
+yes
+#endif],
+				[ipv6type=$i;
+				ipv6lib=inet6;
+				ipv6libdir=/usr/local/v6/lib;
+				AC_DEFINE(INET6, 1, [true if you have IPv6])])
+			;;
+		v6d)
+			AC_EGREP_CPP(yes, [
+#include </usr/local/v6/include/sys/v6config.h>
+#ifdef __V6D__
+yes
+#endif],
+				[ipv6type=$i;
+				ipv6lib=v6;
+				ipv6libdir=/usr/local/v6/lib;
+				AC_DEFINE(INET6, 1, [true if you have IPv6])])
+			;;
+		zeta)
+			AC_EGREP_CPP(yes, [
+#include <sys/param.h>
+#ifdef _ZETA_MINAMI_INET6
+yes
+#endif],
+				[ipv6type=$i;
+				ipv6lib=inet6;
+				ipv6libdir=/usr/local/v6/lib;
+				AC_DEFINE(INET6, 1, [true if you have IPv6])])
+			;;
+		esac
+		if test "$ipv6type" != "unknown"; then
+			break
+		fi
+	done
+	AC_MSG_RESULT($ipv6type)
+
+	AC_SEARCH_LIBS(getaddrinfo, inet6)
+fi
+
+dnl Do you want to disable use of locale functions
+AC_ARG_ENABLE([locale],
+	AC_HELP_STRING([--disable-locale],
+		[disable locale features]))
+AH_TEMPLATE([CONFIG_LOCALE],
+[Undefine if you don't want locale features.  By default this is defined.])
+if test x"$enable_locale" != x"no"; then
+	AC_DEFINE(CONFIG_LOCALE)
+fi
+
+AC_MSG_CHECKING([whether to call shutdown on all sockets])
+case $host_os in
+	*cygwin* ) AC_MSG_RESULT(yes)
+                   AC_DEFINE(SHUTDOWN_ALL_SOCKETS, 1,
+			    [Define to 1 if sockets need to be shutdown])
+		   ;;
+	       * ) AC_MSG_RESULT(no);;
+esac
+
+AC_C_BIGENDIAN
+AC_HEADER_DIRENT
+AC_HEADER_TIME
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
+    unistd.h utime.h grp.h compat.h sys/param.h ctype.h sys/wait.h \
+    sys/ioctl.h sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h \
+    sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
+    netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
+    sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
+    popt.h popt/popt.h)
+AC_HEADER_MAJOR
+
+AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
+AC_TRY_RUN([
+#include <sys/types.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+# if !defined makedev && (defined mkdev || defined _WIN32 || defined __WIN32__)
+#  define makedev mkdev
+# endif
+#elif defined MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+
+int main(void)
+{
+	dev_t dev = makedev(0, 5, 7);
+	if (major(dev) != 5 || minor(dev) != 7)
+		exit(1);
+	return 0;
+}
+],
+rsync_cv_MAKEDEV_TAKES_3_ARGS=yes,rsync_cv_MAKEDEV_TAKES_3_ARGS=no,rsync_cv_MAKEDEV_TAKES_3_ARGS=no)])
+if test x"$rsync_cv_MAKEDEV_TAKES_3_ARGS" = x"yes"; then
+   AC_DEFINE(MAKEDEV_TAKES_3_ARGS, 1, [Define to 1 if makedev() takes 3 args])
+fi
+
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int16_t)
+AC_CHECK_SIZEOF(uint16_t)
+AC_CHECK_SIZEOF(int32_t)
+AC_CHECK_SIZEOF(uint32_t)
+AC_CHECK_SIZEOF(int64_t)
+AC_CHECK_SIZEOF(off_t)
+AC_CHECK_SIZEOF(off64_t)
+AC_CHECK_SIZEOF(time_t)
+
+AC_C_INLINE
+AC_C_LONG_DOUBLE
+
+AC_TYPE_SIGNAL
+AC_TYPE_UID_T
+AC_CHECK_TYPES([mode_t,off_t,size_t,pid_t,id_t])
+AC_TYPE_GETGROUPS
+AC_CHECK_MEMBERS([struct stat.st_rdev])
+
+TYPE_SOCKLEN_T
+
+AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [
+    AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
+	rsync_cv_errno=yes,rsync_cv_have_errno_decl=no)])
+if test x"$rsync_cv_errno" = x"yes"; then
+   AC_DEFINE(HAVE_ERRNO_DECL, 1, [Define to 1 if errno is declared in errno.h])
+fi
+
+# The following test taken from the cvs sources
+# If we can't find connect, try looking in -lsocket, -lnsl, and -linet.
+# These need checks to be before checks for any other functions that
+#    might be in the same libraries.
+# The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has
+# libsocket.so which has a bad implementation of gethostbyname (it
+# only looks in /etc/hosts), so we only look for -lsocket if we need
+# it.
+AC_CHECK_FUNCS(connect)
+if test x"$ac_cv_func_connect" = x"no"; then
+    case "$LIBS" in
+    *-lnsl*) ;;
+    *) AC_CHECK_LIB(nsl_s, printf) ;;
+    esac
+    case "$LIBS" in
+    *-lnsl*) ;;
+    *) AC_CHECK_LIB(nsl, printf) ;;
+    esac
+    case "$LIBS" in
+    *-lsocket*) ;;
+    *) AC_CHECK_LIB(socket, connect) ;;
+    esac
+    case "$LIBS" in
+    *-linet*) ;;
+    *) AC_CHECK_LIB(inet, connect) ;;
+    esac
+    dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value
+    dnl has been cached.
+    if test x"$ac_cv_lib_socket_connect" = x"yes" ||
+       test x"$ac_cv_lib_inet_connect" = x"yes"; then
+        # ac_cv_func_connect=yes
+        # don't!  it would cause AC_CHECK_FUNC to succeed next time configure is run
+        AC_DEFINE(HAVE_CONNECT, 1, [Define to 1 if you have the "connect" function])
+    fi
+fi
+
+AC_SEARCH_LIBS(inet_ntop, resolv)
+
+# Solaris and HP-UX weirdness:
+# Search for libiconv_open (not iconv_open) to discover if -liconv is needed!
+AC_SEARCH_LIBS(libiconv_open, iconv)
+
+AC_MSG_CHECKING([for iconv declaration])
+AC_CACHE_VAL(am_cv_proto_iconv, [
+    AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+		   [Define as const if the declaration of iconv() needs const.])
+
+dnl AC_MSG_NOTICE([Looking in libraries: $LIBS])
+
+AC_CHECK_FUNCS(inet_ntop, , [AC_LIBOBJ(lib/inet_ntop)])
+AC_CHECK_FUNCS(inet_pton, , [AC_LIBOBJ(lib/inet_pton)])
+
+AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])
+AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/types.h>
+#include <sys/socket.h>])
+
+# Irix 6.5 has getaddrinfo but not the corresponding defines, so use
+#   builtin getaddrinfo if one of the defines don't exist
+AC_CACHE_CHECK([whether defines needed by getaddrinfo exist],
+               rsync_cv_HAVE_GETADDR_DEFINES,[
+			AC_EGREP_CPP(yes, [
+			#include <sys/types.h>
+			#include <sys/socket.h>
+			#include <netdb.h>
+			#ifdef AI_PASSIVE
+			yes
+			#endif],
+			rsync_cv_HAVE_GETADDR_DEFINES=yes,
+			rsync_cv_HAVE_GETADDR_DEFINES=no)])
+if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_addrinfo" = x"yes"; then
+	# Tru64 UNIX has getaddrinfo() but has it renamed in libc as
+	# something else so we must include <netdb.h> to get the
+	# redefinition.
+	AC_CHECK_FUNCS(getaddrinfo, ,
+		[AC_MSG_CHECKING([for getaddrinfo by including <netdb.h>])
+		AC_TRY_LINK([#include <sys/types.h>
+		#include <sys/socket.h>
+		#include <netdb.h>],[getaddrinfo(NULL, NULL, NULL, NULL);],
+			[AC_MSG_RESULT([yes])
+			AC_DEFINE(HAVE_GETADDRINFO, 1,
+				[Define to 1 if you have the "getaddrinfo" function and required types.])],
+			[AC_MSG_RESULT([no])
+			AC_LIBOBJ(lib/getaddrinfo)])])
+else
+	AC_LIBOBJ(lib/getaddrinfo)
+fi
+
+AC_CHECK_MEMBER([struct sockaddr.sa_len],
+		[ AC_DEFINE(HAVE_SOCKADDR_LEN, 1, [Do we have sockaddr.sa_len?]) ],
+		[],
+		[
+#include <sys/types.h>
+#include <sys/socket.h>
+])
+
+AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
+		[ AC_DEFINE(HAVE_SOCKADDR_IN_LEN, 1, [Do we have sockaddr_in.sin_len?]) ],
+		[],
+		[
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+])
+
+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
+		[ AC_DEFINE(HAVE_SOCKADDR_UN_LEN, 1, [Do we have sockaddr_un.sun_len?]) ],
+		[],
+		[
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+])
+
+AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id],
+		[ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID, 1, [Do we have sockaddr_in6.sin6_scope_id?]) ],
+		[],
+		[
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+])
+
+AC_HAVE_TYPE([struct stat64], [#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+])
+
+# if we can't find strcasecmp, look in -lresolv (for Unixware at least)
+#
+AC_CHECK_FUNCS(strcasecmp)
+if test x"$ac_cv_func_strcasecmp" = x"no"; then
+    AC_CHECK_LIB(resolv, strcasecmp)
+fi
+
+AC_CHECK_FUNCS(aclsort)
+if test x"$ac_cv_func_aclsort" = x"no"; then
+    AC_CHECK_LIB(sec, aclsort)
+fi
+
+dnl At the moment we don't test for a broken memcmp(), because all we
+dnl need to do is test for equality, not comparison, and it seems that
+dnl every platform has a memcmp that can do at least that.
+dnl AC_FUNC_MEMCMP
+
+AC_FUNC_UTIME_NULL
+AC_FUNC_ALLOCA
+AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
+    fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
+    memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
+    strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
+    setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
+    strerror putenv iconv_open locale_charset nl_langinfo getxattr \
+    extattr_get_link sigaction sigprocmask setattrlist)
+
+dnl cygwin iconv.h defines iconv_open as libiconv_open
+if test x"$ac_cv_func_iconv_open" != x"yes"; then
+    AC_CHECK_FUNC(libiconv_open, [ac_cv_func_iconv_open=yes; AC_DEFINE(HAVE_ICONV_OPEN, 1)])
+fi
+
+AC_CHECK_FUNCS(getpgrp tcgetpgrp)
+if test $ac_cv_func_getpgrp = yes; then
+    AC_FUNC_GETPGRP
+fi
+
+AC_ARG_ENABLE(iconv,
+    AC_HELP_STRING([--disable-iconv],
+	    [disable rsync's --iconv option]),
+    [], [enable_iconv=$ac_cv_func_iconv_open])
+AH_TEMPLATE([ICONV_OPTION],
+[Define if you want the --iconv option.  Specifing a value will set the
+default iconv setting (a NULL means no --iconv processing by default).])
+if test x"$enable_iconv" != x"no"; then
+	if test x"$enable_iconv" = x"yes"; then
+		AC_DEFINE(ICONV_OPTION, NULL)
+	else
+		AC_DEFINE_UNQUOTED(ICONV_OPTION, "$enable_iconv")
+	fi
+	AC_DEFINE(UTF8_CHARSET, "UTF-8", [String to pass to iconv() for the UTF-8 charset.])
+fi
+
+AC_CACHE_CHECK([whether chown() modifies symlinks],rsync_cv_chown_modifies_symlink,[
+  AC_TRY_RUN([
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <errno.h>
+    main() {
+	char const *dangling_symlink = "conftest.dangle";
+	unlink(dangling_symlink);
+	if (symlink("conftest.no-such", dangling_symlink) < 0) abort();
+	if (chown(dangling_symlink, getuid(), getgid()) < 0 && errno == ENOENT) exit(1);
+	exit(0);
+    }],
+  rsync_cv_chown_modifies_symlink=yes,rsync_cv_chown_modifies_symlink=no,rsync_cv_chown_modifies_symlink=no)])
+if test $rsync_cv_chown_modifies_symlink = yes; then
+  AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.])
+fi
+
+AC_CACHE_CHECK([whether link() can hard-link symlinks],rsync_cv_can_hardlink_symlink,[
+  AC_TRY_RUN([
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <errno.h>
+#define FILENAME "conftest.dangle"
+    main() {
+	unlink(FILENAME);
+	if (symlink("conftest.no-such", FILENAME) < 0) abort();
+	if (link(FILENAME, FILENAME "2") < 0) exit(1);
+	exit(0);
+    }],
+  rsync_cv_can_hardlink_symlink=yes,rsync_cv_can_hardlink_symlink=no,rsync_cv_can_hardlink_symlink=no)])
+if test $rsync_cv_can_hardlink_symlink = yes; then
+  AC_DEFINE(CAN_HARDLINK_SYMLINK, 1, [Define to 1 if link() can hard-link symlinks.])
+fi
+
+AC_CACHE_CHECK([whether link() can hard-link special files],rsync_cv_can_hardlink_special,[
+  AC_TRY_RUN([
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <errno.h>
+#define FILENAME "conftest.fifi"
+    main() {
+	unlink(FILENAME);
+	if (mkfifo(FILENAME, 0777) < 0) abort();
+	if (link(FILENAME, FILENAME "2") < 0) exit(1);
+	exit(0);
+    }],
+  rsync_cv_can_hardlink_special=yes,rsync_cv_can_hardlink_special=no,rsync_cv_can_hardlink_special=no)])
+if test $rsync_cv_can_hardlink_special = yes; then
+    AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
+fi
+
+AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+main() {
+       int fd[2];
+       exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1);
+}],
+rsync_cv_HAVE_SOCKETPAIR=yes,rsync_cv_HAVE_SOCKETPAIR=no,rsync_cv_HAVE_SOCKETPAIR=cross)])
+if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then
+    AC_DEFINE(HAVE_SOCKETPAIR, 1, [Define to 1 if you have the "socketpair" function])
+fi
+
+if test x"$with_included_popt" != x"yes"; then
+    AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
+fi
+if test x"$ac_cv_header_popt_popt_h" = x"yes"; then
+    # If the system has /usr/include/popt/popt.h, we enable the
+    # included popt because an attempt to "#include <popt/popt.h>"
+    # would use our included header file anyway (due to -I.), and
+    # might conflict with the system popt.
+    with_included_popt=yes
+elif test x"$ac_cv_header_popt_h" != x"yes"; then
+    with_included_popt=yes
+fi
+
+AC_MSG_CHECKING([whether to use included libpopt])
+if test x"$with_included_popt" = x"yes"; then
+    AC_MSG_RESULT($srcdir/popt)
+    BUILD_POPT='$(popt_OBJS)'
+    CFLAGS="$CFLAGS -I$srcdir/popt"
+    if test x"$ALLOCA" != x
+    then
+	# this can be removed when/if we add an included alloca.c;
+	#  see autoconf documentation on AC_FUNC_ALLOCA
+	AC_MSG_WARN([included libpopt will use malloc, not alloca (which wastes a small amount of memory)])
+    fi
+else
+    AC_MSG_RESULT(no)
+fi
+
+AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
+AC_TRY_COMPILE([],[signed char *s = ""],
+rsync_cv_SIGNED_CHAR_OK=yes,rsync_cv_SIGNED_CHAR_OK=no)])
+if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then
+    AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type])
+fi
+
+AC_CACHE_CHECK([for broken readdir],rsync_cv_HAVE_BROKEN_READDIR,[
+AC_TRY_RUN([#include <sys/types.h>
+#include <dirent.h>
+main() { struct dirent *di; DIR *d = opendir("."); di = readdir(d);
+if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
+di->d_name[0] == 0) exit(0); exit(1);} ],
+rsync_cv_HAVE_BROKEN_READDIR=yes,rsync_cv_HAVE_BROKEN_READDIR=no,rsync_cv_HAVE_BROKEN_READDIR=cross)])
+if test x"$rsync_cv_HAVE_BROKEN_READDIR" = x"yes"; then
+    AC_DEFINE(HAVE_BROKEN_READDIR, 1, [Define to 1 if readdir() is broken])
+fi
+
+AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_STRUCT_UTIMBUF,[
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <utime.h>],
+[struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));],
+rsync_cv_HAVE_STRUCT_UTIMBUF=yes,rsync_cv_HAVE_STRUCT_UTIMBUF=no)])
+if test x"$rsync_cv_HAVE_STRUCT_UTIMBUF" = x"yes"; then
+    AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define to 1 if you have the "struct utimbuf" type])
+fi
+
+AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[
+AC_TRY_COMPILE([#include <sys/time.h>
+#include <unistd.h>],
+[struct timeval tv; exit(gettimeofday(&tv, NULL));],
+rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes,rsync_cv_HAVE_GETTIMEOFDAY_TZ=no)])
+if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" != x"no"; then
+    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [Define to 1 if gettimeofday() takes a time-zone arg])
+fi
+
+AC_CACHE_CHECK([for C99 vsnprintf],rsync_cv_HAVE_C99_VSNPRINTF,[
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <stdarg.h>
+void foo(const char *format, ...) {
+       va_list ap;
+       int len;
+       char buf[5];
+
+       va_start(ap, format);
+       len = vsnprintf(0, 0, format, ap);
+       va_end(ap);
+       if (len != 5) exit(1);
+
+       if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1);
+
+       exit(0);
+}
+main() { foo("hello"); }
+],
+rsync_cv_HAVE_C99_VSNPRINTF=yes,rsync_cv_HAVE_C99_VSNPRINTF=no,rsync_cv_HAVE_C99_VSNPRINTF=cross)])
+if test x"$rsync_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
+    AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [Define to 1 if vsprintf has a C99-compatible return value])
+fi
+
+
+AC_CACHE_CHECK([for secure mkstemp],rsync_cv_HAVE_SECURE_MKSTEMP,[
+AC_TRY_RUN([#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+main() {
+  struct stat st;
+  char tpl[20]="/tmp/test.XXXXXX";
+  int fd = mkstemp(tpl);
+  if (fd == -1) exit(1);
+  unlink(tpl);
+  if (fstat(fd, &st) != 0) exit(1);
+  if ((st.st_mode & 0777) != 0600) exit(1);
+  exit(0);
+}],
+rsync_cv_HAVE_SECURE_MKSTEMP=yes,
+rsync_cv_HAVE_SECURE_MKSTEMP=no,
+rsync_cv_HAVE_SECURE_MKSTEMP=cross)])
+if test x"$rsync_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
+    case $target_os in
+    hpux*)
+	dnl HP-UX has a broken mkstemp() implementation they refuse to fix,
+	dnl so we noisily skip using it.  See HP change request JAGaf34426
+	dnl for details. (sbonds)
+	AC_MSG_WARN(Skipping broken HP-UX mkstemp() -- using mktemp() instead)
+	;;
+    *)
+	AC_DEFINE(HAVE_SECURE_MKSTEMP, 1, [Define to 1 if mkstemp() is available and works right])
+	;;
+    esac
+fi
+
+
+AC_CACHE_CHECK([if mknod creates FIFOs],rsync_cv_MKNOD_CREATES_FIFOS,[
+AC_TRY_RUN([
+#include <stdio.h>
+#include <sys/stat.h>
+#include <errno.h>
+main() { int rc, ec; char *fn = "fifo-test";
+unlink(fn); rc = mknod(fn,S_IFIFO,0600); ec = errno; unlink(fn);
+if (rc) {printf("(%d %d) ",rc,ec); return ec;}
+return 0;}],
+           rsync_cv_MKNOD_CREATES_FIFOS=yes,rsync_cv_MKNOD_CREATES_FIFOS=no,rsync_cv_MKNOD_CREATES_FIFOS=cross)])
+if test x"$rsync_cv_MKNOD_CREATES_FIFOS" = x"yes"; then
+    AC_DEFINE(MKNOD_CREATES_FIFOS, 1, [Define to 1 if mknod() can create FIFOs.])
+fi
+
+AC_CACHE_CHECK([if mknod creates sockets],rsync_cv_MKNOD_CREATES_SOCKETS,[
+AC_TRY_RUN([
+#include <stdio.h>
+#include <sys/stat.h>
+#include <errno.h>
+main() { int rc, ec; char *fn = "sock-test";
+unlink(fn); rc = mknod(fn,S_IFSOCK,0600); ec = errno; unlink(fn);
+if (rc) {printf("(%d %d) ",rc,ec); return ec;}
+return 0;}],
+           rsync_cv_MKNOD_CREATES_SOCKETS=yes,rsync_cv_MKNOD_CREATES_SOCKETS=no,rsync_cv_MKNOD_CREATES_SOCKETS=cross)])
+if test x"$rsync_cv_MKNOD_CREATES_SOCKETS" = x"yes"; then
+    AC_DEFINE(MKNOD_CREATES_SOCKETS, 1, [Define to 1 if mknod() can create sockets.])
+fi
+
+#
+# The following test was mostly taken from the tcl/tk plus patches
+#
+AC_CACHE_CHECK([whether -c -o works],rsync_cv_DASHC_WORKS_WITH_DASHO,[
+rm -rf conftest*
+cat > conftest.$ac_ext <<EOF
+int main() { return 0; }
+EOF
+${CC-cc} -c -o conftest..o conftest.$ac_ext
+if test -f conftest..o; then
+    rsync_cv_DASHC_WORKS_WITH_DASHO=yes
+else
+    rsync_cv_DASHC_WORKS_WITH_DASHO=no
+fi
+rm -rf conftest*
+])
+if test x"$rsync_cv_DASHC_WORKS_WITH_DASHO" = x"yes"; then
+    OBJ_SAVE="#"
+    OBJ_RESTORE="#"
+    CC_SHOBJ_FLAG='-o $@'
+else
+    OBJ_SAVE='	@b=`basename $@ .o`;rm -f $$b.o.sav;if test -f $$b.o; then mv $$b.o $$b.o.sav;fi;'
+    OBJ_RESTORE='	@b=`basename $@ .o`;if test "$$b.o" != "$@"; then mv $$b.o $@; if test -f $$b.o.sav; then mv $$b.o.sav $$b.o; fi; fi'
+    CC_SHOBJ_FLAG=""
+fi
+
+AC_SUBST(OBJ_SAVE)
+AC_SUBST(OBJ_RESTORE)
+AC_SUBST(CC_SHOBJ_FLAG)
+AC_SUBST(BUILD_POPT)
+AC_SUBST(MAKE_MAN)
+
+AC_CHECK_FUNCS(_acl __acl _facl __facl)
+#################################################
+# check for ACL support
+
+AC_MSG_CHECKING([whether to support ACLs])
+AC_ARG_ENABLE(acl-support,
+	AC_HELP_STRING([--disable-acl-support],
+		       [disable ACL support]))
+
+if test x"$enable_acl_support" = x"no"; then
+    AC_MSG_RESULT(no)
+else
+    case "$host_os" in
+    *sysv5*)
+	AC_MSG_RESULT(Using UnixWare ACLs)
+	AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs])
+	AC_DEFINE(SUPPORT_ACLS, 1, [Define to 1 to add support for ACLs])
+	;;
+    *solaris*|*cygwin*)
+	AC_MSG_RESULT(Using solaris ACLs)
+	AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
+	AC_DEFINE(SUPPORT_ACLS, 1)
+	;;
+    *hpux*)
+	AC_MSG_RESULT(Using HPUX ACLs)
+	AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
+	AC_DEFINE(SUPPORT_ACLS, 1)
+	;;
+    *irix*)
+	AC_MSG_RESULT(Using IRIX ACLs)
+	AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
+	AC_DEFINE(SUPPORT_ACLS, 1)
+	;;
+    *aix*)
+	AC_MSG_RESULT(Using AIX ACLs)
+	AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs])
+	AC_DEFINE(SUPPORT_ACLS, 1)
+	;;
+    *osf*)
+	AC_MSG_RESULT(Using Tru64 ACLs)
+	AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs])
+	AC_DEFINE(SUPPORT_ACLS, 1)
+	LIBS="$LIBS -lpacl"
+	;;
+    darwin*)
+	AC_MSG_RESULT(Using OS X ACLs)
+	AC_DEFINE(HAVE_OSX_ACLS, 1, [true if you have Mac OS X ACLs])
+	AC_DEFINE(SUPPORT_ACLS, 1)
+	;;
+    *)
+	AC_MSG_RESULT(running tests:)
+	AC_CHECK_LIB(acl,acl_get_file)
+	    AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
+	    AC_TRY_LINK([#include <sys/types.h>
+#include <sys/acl.h>],
+[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
+samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
+	AC_MSG_CHECKING(ACL test results)
+	if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
+	    AC_MSG_RESULT(Using posix ACLs)
+	    AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
+	    AC_DEFINE(SUPPORT_ACLS, 1)
+	    AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
+		AC_TRY_LINK([#include <sys/types.h>
+#include <sys/acl.h>],
+[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
+samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
+	    if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
+		AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
+	    fi
+	else
+	    if test x"$enable_acl_support" = x"yes"; then
+		AC_MSG_ERROR(Failed to find ACL support)
+	    else
+		AC_MSG_RESULT(No ACL support found)
+	    fi
+	fi
+	;;
+    esac
+fi
+
+#################################################
+# check for extended attribute support
+AC_MSG_CHECKING(whether to support extended attributes)
+AC_ARG_ENABLE(xattr-support,
+    AC_HELP_STRING([--disable-xattr-support],
+	    [disable extended attributes]),
+    [], [case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link" in
+	*yes*) enable_xattr_support=maybe ;;
+	*) enable_xattr_support=no ;;
+	esac])
+AH_TEMPLATE([SUPPORT_XATTRS],
+[Define to 1 to add support for extended attributes])
+if test x"$enable_xattr_support" = x"no"; then
+    AC_MSG_RESULT(no)
+else
+    case "$host_os" in
+    *linux*)
+	AC_MSG_RESULT(Using Linux xattrs)
+	AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
+	AC_DEFINE(SUPPORT_XATTRS, 1)
+	;;
+    darwin*)
+	AC_MSG_RESULT(Using OS X xattrs)
+	AC_DEFINE(HAVE_OSX_XATTRS, 1, [True if you have Mac OS X xattrs])
+	AC_DEFINE(SUPPORT_XATTRS, 1)
+	;;
+    freebsd*)
+	AC_MSG_RESULT(Using FreeBSD extattrs)
+	AC_DEFINE(HAVE_FREEBSD_XATTRS, 1, [True if you have FreeBSD xattrs])
+	AC_DEFINE(SUPPORT_XATTRS, 1)
+	;;
+    *)
+	if test x"$enable_xattr_support" = x"yes"; then
+	    AC_MSG_ERROR(Failed to find extended attribute support)
+	else
+	    AC_MSG_RESULT(No extended attribute support found)
+	fi
+	;;
+    esac
+fi
+
+if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"$enable_iconv" = x"no"; then
+    AC_MSG_CHECKING([whether $CC supports -Wno-unused-parameter])
+    OLD_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS -Wno-unused-parameter"
+    AC_COMPILE_IFELSE([ ], [rsync_warn_flag=yes], [rsync_warn_flag=no])
+    AC_MSG_RESULT([$rsync_warn_flag])
+    if test x"$rsync_warn_flag" = x"no"; then
+	CFLAGS="$OLD_CFLAGS"
+    fi
+fi
+
+case "$CC" in
+' checker'*|checker*)
+    AC_DEFINE(FORCE_FD_ZERO_MEMSET, 1, [Used to make "checker" understand that FD_ZERO() clears memory.])
+    ;;
+esac
+
+AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
+AC_OUTPUT
+
+AC_MSG_RESULT()
+AC_MSG_RESULT([    rsync ${RSYNC_VERSION} configuration successful])
+AC_MSG_RESULT()
@@ -2,7 +2,6 @@
 * Support the max connections option.
 *
 * Copyright (C) 1998 Andrew Tridgell
- * Copyright (C) 2006-2020 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -30,9 +29,7 @@ int claim_connection(char *fname, int max_connections)
 	if (max_connections == 0)
 		return 1;

-	/* 'lock file = PATH': refuse symlinks not owned by uid 0 or our euid so
-	 * a planted parent can't redirect the root daemon's O_CREAT open. */
-	if ((fd = vfs_open_owner_walk(fname, O_RDWR|O_CREAT, 0600, 0)) < 0)
+	if ((fd = open(fname, O_RDWR|O_CREAT, 0600)) < 0)
 		return 0;

 	/* Find a free spot. */
@@ -7,54 +7,39 @@ basically a summary of clientserver.c and authenticate.c.
 This is the protocol used for rsync --daemon; i.e. connections to port
 873 rather than invocations over a remote shell.

-When the server accepts a connection, it prints a newline-terminated
-greeting line:
+When the server accepts a connection, it prints a greeting

-  @RSYNCD: <version>.<subprotocol> <digest1> <digestN>
+  @RSYNCD: <version>.<subprotocol>

-The <version> is the numeric version (see PROTOCOL_VERSION in rsync.h)
-The <subprotocol> is the numeric subprotocol version (which is 0 for a
-final protocol version, as the SUBPROTOCOL_VERSION define discusses).
-The <digestN> names are the authentication digest algorithms that the
-daemon supports, listed in order of preference.
-
-An rsync prior to 3.2.7 omits the digest names.  An rsync prior to 3.0.0
-also omits the period and the <subprotocol> value.  Since a final
-protocol has a subprotocol value of 0, a missing subprotocol value is
-assumed to be 0 for any protocol prior to 30.  It is considered a fatal
-error for protocol 30 and above to omit it.  It is considered a fatal
-error for protocol 32 and above to omit the digest name list (currently
-31 is the newest protocol).
-
-The daemon expects to see a similar greeting line back from the client.
-Once received, the daemon follows the opening line with a free-format
-text message-of-the-day (if any is defined).
+where <version> is the numeric version (see PROTOCOL_VERSION in rsync.h)
+'.' is a literal period, and <subprotocol> is the numeric subprotocol
+version (see SUBPROTOCOL_VERSION -- it will be 0 for final releases).
+Protocols prior to 30 only output <version> alone.  The daemon expects
+to see a similar greeting back from the client.  For protocols prior to
+30, an absent ".<subprotocol>" value is assumed to be 0.  For protocol
+30, an absent value is a fatal error.  The daemon then follows this line
+with a free-format text message-of-the-day (if any is defined).

 The server is now in the connected state.  The client can either send
-the command:
+the command

  #list

-(to get a listing of modules) or the name of a module.  After this, the
+to get a listing of modules, or the name of a module.  After this, the
 connection is now bound to a particular module.  Access per host for
 this module is now checked, as is per-module connection limits.

-If authentication is required to use this module, the server will say:
+If authentication is required to use this module, the server will say

  @RSYNCD: AUTHREQD <challenge>

 where <challenge> is a random string of base64 characters.  The client
-must respond with:
+must respond with

  <user> <response>

-The <user> is the username they claim to be. The <response> is the
-base64 form of the digest hash of the challenge+password string. The
-chosen digest method is the most preferred client method that is also in
-the server's list.  If no digest list was explicitly provided, the side
-expecting a list assumes the other side provided either the single name
-"md5" (for a negotiated protocol 30 or 31), or the single name "md4"
-(for an older protocol).
+where <user> is the username they claim to be, and <response> is the
+base64 form of the MD4 hash of challenge+password.

 At this point the server applies all remaining constraints before
 handing control to the client, including switching uid/gid, setting up
@@ -91,13 +76,6 @@ stay tuned (or write it yourself!).
 ------------
 Protocol version changes

-31	(2013-09-28, 3.1.0)
-
-	Initial release of protocol 31 had no changes.  Rsync 3.2.7
-	introduced the suffixed list of digest names on the greeting
-	line.  The presence of the list is allowed even if the greeting
-	indicates an older protocol version number.
-
 30	(2007-10-04, 3.0.0pre1)

 	The use of a ".<subprotocol>" number was added to
@@ -1,121 +0,0 @@
-#!/usr/bin/awk -f
-
-# The caller must pass arg: daemon-parm.txt
-# The resulting code is output into daemon-parm.h
-
-BEGIN {
-    heading = "/* DO NOT EDIT THIS FILE!  It is auto-generated from a list of values in " ARGV[1] "! */\n\n"
-    sect = psect = defines = accessors = prior_ptype = ""
-    parms = "\nstatic const struct parm_struct parm_table[] = {"
-    comment_fmt = "\n/********** %s **********/\n"
-    tdstruct = "typedef struct {"
-}
-
-/^\s*$/ { next }
-/^#/ { next }
-
-/^Globals:/ {
-    if (defines != "") {
-	print "The Globals section must come first!"
-	defines = ""
-	exit
-    }
-    defines = tdstruct
-    values = "\nstatic const all_vars Defaults = {\n    { /* Globals: */\n"
-    exps = exp_values = sprintf(comment_fmt, "EXP")
-    sect = "GLOBAL"
-    psect = ", P_GLOBAL, &Vars.g."
-    next
-}
-
-/^Locals:/ {
-    if (sect == "") {
-	print "The Locals section must come after the Globals!"
-	exit
-    }
-    defines = defines exps "} global_vars;\n\n" tdstruct
-    values = values exp_values "\n    }, { /* Locals: */\n"
-    exps = exp_values = sprintf(comment_fmt, "EXP")
-    sect = "LOCAL"
-    psect = ", P_LOCAL, &Vars.l."
-    next
-}
-
-/^(STRING|CHAR|PATH|INTEGER|ENUM|OCTAL|BOOL|BOOLREV|BOOL3)[ \t]/ {
-    ptype = $1
-    name = $2
-    $1 = $2 = ""
-    sub(/^[ \t]+/, "")
-
-    if (ptype != prior_ptype) {
-	comment = sprintf(comment_fmt, ptype)
-	defines = defines comment
-	values = values comment
-	parms = parms "\n"
-	accessors = accessors "\n"
-	prior_ptype = ptype
-    }
-
-    if (ptype == "STRING" || ptype == "PATH") {
-	atype = "STRING"
-	vtype = "char*"
-    } else if (ptype ~ /BOOL/) {
-	atype = vtype = "BOOL"
-    } else if (ptype == "CHAR") {
-	atype = "CHAR"
-	vtype = "char"
-    } else {
-	atype = "INTEGER"
-	vtype = "int"
-    }
-
-    # The name might be var_name|public_name
-    pubname = name
-    sub(/\|.*/, "", name)
-    sub(/.*\|/, "", pubname)
-    gsub(/_/, " ", pubname)
-    gsub(/-/, "", name)
-
-    if (ptype == "ENUM")
-	enum = "enum_" name
-    else
-	enum = "NULL"
-
-    defines = defines "\t" vtype " " name ";\n"
-    values = values "\t" $0 ", /* " name " */\n"
-    parms = parms " {\"" pubname "\", P_" ptype psect name ", " enum ", 0},\n"
-    # The shell-executed hook params (whose %RSYNC_*% expansion is fed to
-    # /bin/sh) use the _SHELL accessor, which single-quotes peer-controlled
-    # values to prevent injection.  Ordinary string params must NOT quote --
-    # it would corrupt a documented `path = /home/%RSYNC_USER_NAME%` etc.
-    if (atype == "STRING" && (name == "early_exec" || name == "prexfer_exec" || name == "postxfer_exec" || name == "name_converter"))
-	accessors = accessors "FN_" sect "_STRING_SHELL(lp_" name ", " name ")\n"
-    else
-	accessors = accessors "FN_" sect "_" atype "(lp_" name ", " name ")\n"
-
-    if (vtype == "char*") {
-	exps = exps "\tBOOL " name "_EXP;\n"
-	exp_values = exp_values "\tFalse, /* " name "_EXP */\n"
-    }
-
-    next
-}
-
-/./ {
-    print "Extraneous line:" $0
-    defines = ""
-    exit
-}
-
-END {
-    if (sect != "" && defines != "") {
-	defines = defines exps "} local_vars;\n\n"
-	defines = defines tdstruct "\n\tglobal_vars g;\n\tlocal_vars l;\n} all_vars;\n"
-	values = values exp_values "\n    }\n};\n\nstatic all_vars Vars;\n"
-	parms = parms "\n {NULL, P_BOOL, P_NONE, NULL, NULL, 0}\n};\n"
-	print heading defines values parms accessors > "daemon-parm.h"
-    } else {
-	print "Failed to parse the data in " ARGV[1]
-	exit 1
-    }
-}
@@ -1,71 +0,0 @@
-Globals: ================================================================
-
-STRING	bind_address|address	NULL
-STRING	daemon_chroot		NULL
-STRING	daemon_gid		NULL
-STRING	daemon_uid		NULL
-STRING	motd_file		NULL
-STRING	pid_file		NULL
-STRING	proxy_protocol_hosts	NULL
-STRING	socket_options		NULL
-
-INTEGER	listen_backlog		5
-INTEGER	rsync_port|port		0
-
-BOOL	proxy_protocol		False
-
-Locals: =================================================================
-
-STRING	auth_digest		NULL
-STRING	auth_users		NULL
-STRING	charset			NULL
-STRING	comment			NULL
-STRING	dont_compress		DEFAULT_DONT_COMPRESS
-STRING	early_exec		NULL
-STRING	exclude			NULL
-STRING	exclude_from		NULL
-STRING	filter			NULL
-STRING	gid			NULL
-STRING	hosts_allow		NULL
-STRING	hosts_deny		NULL
-STRING	include			NULL
-STRING	include_from		NULL
-STRING	incoming_chmod		NULL
-STRING	lock_file		DEFAULT_LOCK_FILE
-STRING	log_file		NULL
-STRING	log_format		"%o %h [%a] %m (%u) %f %l"
-STRING	name			NULL
-STRING	name_converter		NULL
-STRING	outgoing_chmod		NULL
-STRING	post-xfer_exec		NULL
-STRING	pre-xfer_exec		NULL
-STRING	refuse_options		NULL
-STRING	secrets_file		NULL
-STRING	syslog_tag		"rsyncd"
-STRING	uid			NULL
-
-PATH	path			NULL
-PATH	temp_dir		NULL
-
-INTEGER	max_connections		0
-INTEGER	max_verbosity		1
-INTEGER	timeout			0
-
-ENUM	syslog_facility		LOG_DAEMON
-
-BOOL	fake_super		False
-BOOL	forward_lookup		True
-BOOL	ignore_errors		False
-BOOL	ignore_nonreadable	False
-BOOL	insecure_links		False
-BOOL	list			True
-BOOL	read_only		True
-BOOL	reverse_lookup		True
-BOOL	strict_modes		True
-BOOL	transfer_logging	False
-BOOL	write_only		False
-
-BOOL3	munge_symlinks		Unset
-BOOL3	numeric_ids		Unset
-BOOL3	open_noatime		Unset
-BOOL3	use_chroot		Unset
@@ -1,41 +0,0 @@
-#!/usr/bin/awk -f
-
-# The caller must pass args: -v hfile=NAME rsync.1.md
-
-BEGIN {
-    heading = "/* DO NOT EDIT THIS FILE!  It is auto-generated from a list of values in " ARGV[1] "! */"
-    if (hfile ~ /compress/) {
-	define = "#define DEFAULT_DONT_COMPRESS"
-	prefix = "*."
-    } else {
-	define = "#define DEFAULT_CVSIGNORE"
-	prefix = ""
-    }
-    value_list = ""
-}
-
-/^    > [^ ]+$/ {
-    gsub(/`/, "")
-    if (value_list != "") value_list = value_list " "
-    value_list = value_list prefix $2
-    next
-}
-
-value_list ~ /\.gz / && hfile ~ /compress/ {
-    exit
-}
-
-value_list ~ /SCCS / && hfile ~ /cvsignore/ {
-    exit
-}
-
-value_list = ""
-
-END {
-    if (value_list != "")
-	print heading "\n\n" define " \"" value_list "\"" > hfile
-    else {
-	print "Failed to find a value list in " ARGV[1] " for " hfile
-	exit 1
-    }
-}
@@ -1,310 +0,0 @@
-/*
- * Deletion routines used in rsync.
- *
- * Copyright (C) 1996-2000 Andrew Tridgell
- * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2024 Wayne Davison
- *
- * This program is free software; you can redistribute it and/or modify
- * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, visit the http://fsf.org website.
- */
-
-#include "rsync.h"
-
-extern int am_root;
-extern int make_backups;
-extern int max_delete;
-extern char *backup_dir;
-extern char *backup_suffix;
-extern int backup_suffix_len;
-extern struct stats stats;
-
-int ignore_perishable = 0;
-int non_perishable_cnt = 0;
-int skipped_deletes = 0;
-
-/* Held fd of the directory whose contents delete_dir_contents() is currently
- * removing, so delete_item()'s per-entry rmdir/unlink/chmod go through it
- * instead of re-resolving the full path for every entry.  Set (with save/
- * restore across the recursion) around the delete loop; -1 outside a recursive
- * delete or when the secure resolver is gated off (chroot / non-receiver) or
- * the path doesn't live directly in that dir. */
-static int del_dirfd = -1;
-static const char *del_dir_prefix;
-static int del_dir_prefix_len;
-
-/* If `path` is a single component directly inside the dir being deleted,
- * point *leaf at its basename and return the held dir fd; else return -1. */
-static int del_held_dfd(const char *path, const char **leaf)
-{
-	if (del_dirfd >= 0
-	 && strncmp(path, del_dir_prefix, del_dir_prefix_len) == 0
-	 && path[del_dir_prefix_len] == '/'
-	 && strchr(path + del_dir_prefix_len + 1, '/') == NULL) {
-		*leaf = path + del_dir_prefix_len + 1;
-		return del_dirfd;
-	}
-	return -1;
-}
-
-static void del_chmod(const char *fbuf, mode_t mode)
-{
-	const char *leaf;
-	int dfd = del_held_dfd(fbuf, &leaf);
-	if (dfd >= 0)
-		vfs_chmod(dfd, leaf, mode, 0);
-	else
-		vfs_chmod(VFS_AT_FDCWD, fbuf, mode, 0);
-}
-
-/* vfs_flags carries VFS_OPERATOR_PATH for a backup-tree delete (DEL_FOR_BACKUP):
- * the path-based fallback then resolves the leaf's parent via the ownership walk,
- * matching the confinement the base gives this unlink under make_backup() (where
- * the held dirfd is absent for a cross-tree --backup-dir leaf).  A held-dirfd
- * delete is already confined, so it ignores the flag. */
-static int del_unlink(const char *fbuf, int vfs_flags)
-{
-	const char *leaf;
-	int dfd = del_held_dfd(fbuf, &leaf);
-	if (dfd >= 0 && vfs_unlink(dfd, leaf, 0) == 0)
-		return 0;
-	return robust_unlink(fbuf, vfs_flags);	/* fall back (ETXTBSY retry, or not held) */
-}
-
-static inline int is_backup_file(char *fn)
-{
-	int k = strlen(fn) - backup_suffix_len;
-	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
-}
-
-/* The directory is about to be deleted: if DEL_RECURSE is given, delete all
- * its contents, otherwise just checks for content.  Returns DR_SUCCESS or
- * DR_NOT_EMPTY.  Note that fname must point to a MAXPATHLEN buffer!  (The
- * buffer is used for recursion, but returned unchanged.)
- */
-static enum delret delete_dir_contents(char *fname, uint16 flags)
-{
-	struct file_list *dirlist;
-	enum delret ret;
-	unsigned remainder;
-	void *save_filters;
-	int j, dlen;
-	char *p;
-
-	if (DEBUG_GTE(DEL, 3)) {
-		rprintf(FINFO, "delete_dir_contents(%s) flags=%d\n",
-			fname, flags);
-	}
-
-	dlen = strlen(fname);
-	save_filters = push_local_filters(fname, dlen);
-
-	non_perishable_cnt = 0;
-	dirlist = get_dirlist(fname, dlen, 0);
-	ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
-
-	if (!dirlist->used)
-		goto done;
-
-	if (!(flags & DEL_RECURSE)) {
-		ret = DR_NOT_EMPTY;
-		goto done;
-	}
-
-	p = fname + dlen;
-	if (dlen != 1 || *fname != '/')
-		*p++ = '/';
-	remainder = MAXPATHLEN - (p - fname);
-
-	/* We do our own recursion, so make delete_item() non-recursive. */
-	flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM|DEL_NO_UID_WRITE))
-	      | DEL_DIR_IS_EMPTY;
-
-	/* Hold this dir open so the per-entry chmod/rmdir/unlink below (and in
-	 * delete_item) become *at() calls against it rather than re-resolving the
-	 * full path for every entry.  Save/restore around the recursion. */
-	int save_del_dirfd = del_dirfd;
-	const char *save_del_prefix = del_dir_prefix;
-	int save_del_prefix_len = del_dir_prefix_len;
-	fname[dlen] = '\0';
-	del_dirfd = vfs_opendir(fname);
-	fname[dlen] = '/';
-	del_dir_prefix = fname;
-	del_dir_prefix_len = dlen;
-
-	for (j = dirlist->used; j--; ) {
-		struct file_struct *fp = dirlist->files[j];
-
-		if (fp->flags & FLAG_MOUNT_DIR && S_ISDIR(fp->mode)) {
-			if (DEBUG_GTE(DEL, 1)) {
-				rprintf(FINFO,
-					"mount point, %s, pins parent directory\n",
-					f_name(fp, NULL));
-			}
-			ret = DR_NOT_EMPTY;
-			continue;
-		}
-
-		strlcpy(p, fp->basename, remainder);
-		if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
-			del_chmod(fname, fp->mode | S_IWUSR);
-		/* Save stack by recursing to ourself directly. */
-		if (S_ISDIR(fp->mode)) {
-			if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
-				ret = DR_NOT_EMPTY;
-		}
-		if (delete_item(fname, fp->mode, flags) != DR_SUCCESS)
-			ret = DR_NOT_EMPTY;
-	}
-
-	if (del_dirfd >= 0)
-		close(del_dirfd);
-	del_dirfd = save_del_dirfd;
-	del_dir_prefix = save_del_prefix;
-	del_dir_prefix_len = save_del_prefix_len;
-
-	fname[dlen] = '\0';
-
-  done:
-	flist_free(dirlist);
-	pop_local_filters(save_filters);
-
-	if (ret == DR_NOT_EMPTY) {
-		rprintf(FINFO, "cannot delete non-empty directory: %s\n",
-			fname);
-	}
-	return ret;
-}
-
-/* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
- * delete recursively.
- *
- * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's
- * a directory! (The buffer is used for recursion, but returned unchanged.)
- */
-enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
-{
-	enum delret ret;
-	char *what;
-	int ok;
-
-	if (DEBUG_GTE(DEL, 2)) {
-		rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
-			fbuf, (int)mode, (int)flags);
-	}
-
-	if (flags & DEL_NO_UID_WRITE)
-		del_chmod(fbuf, mode | S_IWUSR);
-
-	if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
-		/* This only happens on the first call to delete_item() since
-		 * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
-		ignore_perishable = 1;
-		/* If DEL_RECURSE is not set, this just reports emptiness. */
-		ret = delete_dir_contents(fbuf, flags);
-		ignore_perishable = 0;
-		if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
-			goto check_ret;
-		/* OK: try to delete the directory. */
-	}
-
-	if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && stats.deleted_files >= max_delete) {
-		skipped_deletes++;
-		return DR_AT_LIMIT;
-	}
-
-	if (S_ISDIR(mode)) {
-		const char *leaf;
-		int dfd = del_held_dfd(fbuf, &leaf);
-		what = "rmdir";
-		ok = (dfd >= 0 ? vfs_unlink(dfd, leaf, VFS_REMOVEDIR)
-		   : vfs_unlink(VFS_AT_FDCWD, fbuf,
-				VFS_REMOVEDIR | ((flags & DEL_FOR_BACKUP) ? VFS_OPERATOR_PATH : 0))) == 0;
-	} else {
-		if (make_backups > 0 && !(flags & DEL_FOR_BACKUP) && (backup_dir || !is_backup_file(fbuf))) {
-			what = "make_backup";
-			ok = make_backup(fbuf, True);
-			if (ok == 2) {
-				what = "unlink";
-				ok = del_unlink(fbuf, (flags & DEL_FOR_BACKUP) ? VFS_OPERATOR_PATH : 0) == 0;
-			}
-		} else {
-			what = "unlink";
-			ok = del_unlink(fbuf, (flags & DEL_FOR_BACKUP) ? VFS_OPERATOR_PATH : 0) == 0;
-		}
-	}
-
-	if (ok) {
-		if (!(flags & DEL_MAKE_ROOM)) {
-			log_delete(fbuf, mode);
-			stats.deleted_files++;
-			if (S_ISREG(mode)) {
-				/* Nothing more to count */
-			} else if (S_ISDIR(mode))
-				stats.deleted_dirs++;
-#ifdef SUPPORT_LINKS
-			else if (S_ISLNK(mode))
-				stats.deleted_symlinks++;
-#endif
-			else if (IS_DEVICE(mode))
-				stats.deleted_devices++;
-			else
-				stats.deleted_specials++;
-		}
-		ret = DR_SUCCESS;
-	} else {
-		if (S_ISDIR(mode) && errno == ENOTEMPTY) {
-			rprintf(FINFO, "cannot delete non-empty directory: %s\n",
-				fbuf);
-			ret = DR_NOT_EMPTY;
-		} else if (errno != ENOENT) {
-			rsyserr(FERROR_XFER, errno, "delete_file: %s(%s) failed",
-				what, fbuf);
-			ret = DR_FAILURE;
-		} else
-			ret = DR_SUCCESS;
-	}
-
-  check_ret:
-	if (ret != DR_SUCCESS && flags & DEL_MAKE_ROOM) {
-		const char *desc;
-		switch (flags & DEL_MAKE_ROOM) {
-		case DEL_FOR_FILE: desc = "regular file"; break;
-		case DEL_FOR_DIR: desc = "directory"; break;
-		case DEL_FOR_SYMLINK: desc = "symlink"; break;
-		case DEL_FOR_DEVICE: desc = "device file"; break;
-		case DEL_FOR_SPECIAL: desc = "special file"; break;
-		default: exit_cleanup(RERR_UNSUPPORTED); /* IMPOSSIBLE */
-		}
-		rprintf(FERROR_XFER, "could not make way for %s %s: %s\n",
-			flags & DEL_FOR_BACKUP ? "backup" : "new",
-			desc, fbuf);
-	}
-	return ret;
-}
-
-uint16 get_del_for_flag(uint16 mode)
-{
-	if (S_ISREG(mode))
-		return DEL_FOR_FILE;
-	if (S_ISDIR(mode))
-		return DEL_FOR_DIR;
-	if (S_ISLNK(mode))
-		return DEL_FOR_SYMLINK;
-	if (IS_DEVICE(mode))
-		return DEL_FOR_DEVICE;
-	if (IS_SPECIAL(mode))
-		return DEL_FOR_SPECIAL;
-	exit_cleanup(RERR_UNSUPPORTED); /* IMPOSSIBLE */
-}
@@ -0,0 +1,20 @@
+Handling the rsync SGML documentation
+
+rsync documentation is now primarily in Docbook format.  Docbook is an
+SGML/XML documentation format that is becoming standard on free
+operating systems.  It's also used for Samba documentation.
+
+The SGML files are source code that can be translated into various
+useful output formats, primarily PDF, HTML, Postscript and plain text.  
+
+To do this transformation on Debian, you should install the
+docbook-utils package.  Having done that, you can say 
+
+  docbook2pdf rsync.sgml
+
+and so on.
+
+On other systems you probably need James Clark's "sp" and "JadeTeX"
+packages.  Work it out for yourself and send a note to the mailing
+list.
+
@@ -0,0 +1,42 @@
+Notes on rsync profiling
+
+strlcpy is hot:
+
+                0.00    0.00       1/7735635     push_dir [68]
+                0.00    0.00       1/7735635     pop_dir [71]
+                0.00    0.00       1/7735635     send_file_list [15]
+                0.01    0.00   18857/7735635     send_files [4]
+                0.04    0.00  129260/7735635     send_file_entry [18]
+                0.04    0.00  129260/7735635     make_file [20]
+                0.04    0.00  141666/7735635     send_directory <cycle 1> [36]
+                2.29    0.00 7316589/7735635     f_name [13]
+[14]    11.7    2.42    0.00 7735635         strlcpy [14]
+
+
+Here's the top few functions:
+
+ 46.23      9.57     9.57 13160929     0.00     0.00  mdfour64
+ 14.78     12.63     3.06 13160929     0.00     0.00  copy64
+ 11.69     15.05     2.42  7735635     0.00     0.00  strlcpy
+ 10.05     17.13     2.08    41438     0.05     0.38  sum_update
+  4.11     17.98     0.85 13159996     0.00     0.00  mdfour_update
+  1.50     18.29     0.31                             file_compare
+  1.45     18.59     0.30   129261     0.00     0.01  send_file_entry
+  1.23     18.84     0.26  2557585     0.00     0.00  f_name
+  1.11     19.07     0.23  1483750     0.00     0.00  u_strcmp
+  1.11     19.30     0.23   118129     0.00     0.00  writefd_unbuffered
+  0.92     19.50     0.19  1085011     0.00     0.00  writefd
+  0.43     19.59     0.09   156987     0.00     0.00  read_timeout
+  0.43     19.68     0.09   129261     0.00     0.00  clean_fname
+  0.39     19.75     0.08    32887     0.00     0.38  matched
+  0.34     19.82     0.07        1    70.00 16293.92  send_files
+  0.29     19.89     0.06   129260     0.00     0.00  make_file
+  0.29     19.95     0.06    75430     0.00     0.00  read_unbuffered
+
+
+
+mdfour could perhaps be made faster:
+
+/* NOTE: This code makes no attempt to be fast!  */
+
+There might be an optimized version somewhere that we can borrow.
@@ -0,0 +1,351 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<book id="rsync">
+  <bookinfo>
+    <title>rsync</title>
+    <copyright>
+      <year>1996 -- 2002</year>
+      <holder>Martin Pool</holder>
+      <holder>Andrew Tridgell</holder>
+    </copyright>
+    <author>
+      <firstname>Martin</firstname>
+      <surname>Pool</surname>
+    </author>
+  </bookinfo>
+
+  <chapter>
+    <title>Introduction</title>
+
+    <para>rsync is a flexible program for efficiently copying files or
+      directory trees.
+
+    <para>rsync has many options to select which files will be copied
+      and how they are to be transferred.  It may be used as an
+      alternative to ftp, http, scp or rcp.
+
+    <para>The rsync remote-update protocol allows rsync to transfer just
+      the differences between two sets of files across the network link,
+      using an efficient checksum-search algorithm described in the
+      technical report that accompanies this package.</para>
+
+    <para>Some of the additional features of rsync are:</para>
+
+    <itemizedlist>
+      
+      <listitem>
+	<para>support for copying links, devices, owners, groups and
+	  permissions
+	</para>
+      </listitem>
+      
+      <listitem>
+	<para>
+	  exclude and exclude-from options similar to GNU tar
+	</para>
+      </listitem>
+
+      <listitem>
+	<para>
+	  a CVS exclude mode for ignoring the same files that CVS would ignore
+      </listitem>
+
+      <listitem>
+	<para>
+	  can use any transparent remote shell, including rsh or ssh
+      </listitem>
+
+      <listitem>
+	<para>
+	  does not require root privileges
+      </listitem>
+
+      <listitem>
+	<para>
+	  pipelining of file transfers to minimize latency costs
+      </listitem>
+		
+      <listitem>
+	<para>
+	  support for anonymous or authenticated rsync servers (ideal for
+	  mirroring)
+	</para>
+      </listitem>
+    </itemizedlist>
+  </chapter>
+
+
+
+  <chapter>
+    <title>Using rsync</title>
+    <section>
+      <title>
+	Introductory example
+      </title>
+      
+      <para>
+	Probably the most common case of rsync usage is to copy files
+	to or from a remote machine using
+	<application>ssh</application> as a network transport.  In
+	this situation rsync is a good alternative to
+	<application>scp</application>.
+      </para>
+
+      <para>
+	The most commonly used arguments for rsync are
+      </para>
+
+      <variablelist>
+	<varlistentry>
+	  <term><option>-v</option></term>
+	  <listitem>
+	    <para>Be verbose.  Primarily, display the name of each file as it is copied.</para>
+	  </listitem>
+	</varlistentry>
+
+
+	<varlistentry>
+	  <term><option>-a</option></term>
+	  <listitem>
+	    <para>
+	      Reproduce the structure and attributes of the origin files as exactly
+	      as possible: this includes copying subdirectories, symlinks, special
+	      files, ownership and permissions.  (@xref{Attributes to
+	      copy}.)
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+
+	
+      <para><option>-v </option>
+      
+      <para><option>-z</option>
+	Compress network traffic, using a modified version of the
+	@command{zlib} library.</para>
+      
+      <para><option>-P</option>
+	Display a progress indicator while files are transferred.  This should
+	normally be ommitted if rsync is not run on a terminal.
+      </para>
+    </section>
+
+
+
+
+    <section>
+      <title>Local and remote</title>
+      
+      <para>There are six different ways of using rsync. They
+      are:</para>
+
+      
+
+      <!-- one of (CALLOUTLIST GLOSSLIST ITEMIZEDLIST ORDEREDLIST SEGMENTEDLIST SIMPLELIST VARIABLELIST CAUTION IMPORTANT NOTE TIP WARNING LITERALLAYOUT PROGRAMLISTING PROGRAMLISTINGCO SCREEN SCREENCO SCREENSHOT SYNOPSIS CMDSYNOPSIS FUNCSYNOPSIS CLASSSYNOPSIS FIELDSYNOPSIS CONSTRUCTORSYNOPSIS DESTRUCTORSYNOPSIS METHODSYNOPSIS FORMALPARA PARA SIMPARA ADDRESS BLOCKQUOTE GRAPHIC GRAPHICCO MEDIAOBJECT MEDIAOBJECTCO INFORMALEQUATION INFORMALEXAMPLE INFORMALFIGURE INFORMALTABLE EQUATION EXAMPLE FIGURE TABLE MSGSET PROCEDURE SIDEBAR QANDASET ANCHOR BRIDGEHEAD REMARK HIGHLIGHTS ABSTRACT AUTHORBLURB EPIGRAPH INDEXTERM REFENTRY SECTION) -->
+      <orderedlist>
+	<listitem>
+	  <para>
+	    for copying local files. This is invoked when neither
+	    source nor destination path contains a @code{:} separator
+
+	<listitem>
+	  <para>
+	    for copying from the local machine to a remote machine using
+	    a remote shell program as the transport (such as rsh or
+	    ssh). This is invoked when the destination path contains a
+	    single @code{:} separator.
+
+	<listitem>
+	  <para>
+	    for copying from a remote machine to the local machine
+	    using a remote shell program. This is invoked when the source
+	    contains a @code{:} separator.
+
+	<listitem>
+	  <para>
+	    for copying from a remote rsync server to the local
+	    machine. This is invoked when the source path contains a @code{::}
+	    separator or a @code{rsync://} URL.
+
+	<listitem>
+	  <para>
+	    for copying from the local machine to a remote rsync
+	    server. This is invoked when the destination path contains a @code{::}
+	    separator.
+
+	<listitem>
+	  <para>
+	    for listing files on a remote machine. This is done the
+	    same way as rsync transfers except that you leave off the
+	    local destination.  
+
+	</listitem>
+      </orderedlist>
+	  <para>
+Note that in all cases (other than listing) at least one of the source
+and destination paths must be local.
+
+	  <para>
+Any one invocation of rsync makes a copy in a single direction.  rsync
+currently has no equivalent of @command{ftp}'s interactive mode.
+
+@cindex @sc{nfs}
+@cindex network filesystems
+@cindex remote filesystems
+
+	  <para>
+rsync's network protocol is generally faster at copying files than
+network filesystems such as @sc{nfs} or @sc{cifs}.  It is better to
+run rsync on the file server either as a daemon or over ssh than
+running rsync giving the network directory.
+      </para>
+    </section>
+  </chapter>
+
+
+
+  <chapter>
+    <title>Frequently asked questions</title>
+
+    
+    <!-- one of (CALLOUTLIST GLOSSLIST ITEMIZEDLIST ORDEREDLIST SEGMENTEDLIST SIMPLELIST VARIABLELIST CAUTION IMPORTANT NOTE TIP WARNING LITERALLAYOUT PROGRAMLISTING PROGRAMLISTINGCO SCREEN SCREENCO SCREENSHOT SYNOPSIS CMDSYNOPSIS FUNCSYNOPSIS CLASSSYNOPSIS FIELDSYNOPSIS CONSTRUCTORSYNOPSIS DESTRUCTORSYNOPSIS METHODSYNOPSIS FORMALPARA PARA SIMPARA ADDRESS BLOCKQUOTE GRAPHIC GRAPHICCO MEDIAOBJECT MEDIAOBJECTCO INFORMALEQUATION INFORMALEXAMPLE INFORMALFIGURE INFORMALTABLE EQUATION EXAMPLE FIGURE TABLE MSGSET PROCEDURE SIDEBAR QANDASET ANCHOR BRIDGEHEAD REMARK HIGHLIGHTS ABSTRACT AUTHORBLURB EPIGRAPH INDEXTERM SECTION SIMPLESECT REFENTRY SECT1) -->
+    <qandaset>
+      <!-- one of (QANDADIV QANDAENTRY) -->
+
+      <qandaentry>
+	<question>
+	  <!-- one of (CALLOUTLIST GLOSSLIST ITEMIZEDLIST ORDEREDLIST
+	  SEGMENTEDLIST SIMPLELIST VARIABLELIST CAUTION IMPORTANT NOTE
+	  TIP WARNING LITERALLAYOUT PROGRAMLISTING PROGRAMLISTINGCO
+	  SCREEN SCREENCO SCREENSHOT SYNOPSIS CMDSYNOPSIS FUNCSYNOPSIS
+	  CLASSSYNOPSIS FIELDSYNOPSIS CONSTRUCTORSYNOPSIS
+	  DESTRUCTORSYNOPSIS METHODSYNOPSIS FORMALPARA PARA SIMPARA
+	  ADDRESS BLOCKQUOTE GRAPHIC GRAPHICCO MEDIAOBJECT
+	  MEDIAOBJECTCO INFORMALEQUATION INFORMALEXAMPLE
+	  INFORMALFIGURE INFORMALTABLE EQUATION EXAMPLE FIGURE TABLE
+	  PROCEDURE ANCHOR BRIDGEHEAD REMARK HIGHLIGHTS INDEXTERM) -->
+	  <para>Are there mailing lists for rsync?
+	</question>
+
+	<answer>
+	  <para>Yes, and you can subscribe and unsubscribe through a
+	  web interface at
+	    <ulink
+	      url="http://lists.samba.org/">http://lists.samba.org/</ulink>
+	  </para>
+
+	  <para>
+	    If you are having trouble with the mailing list, please
+	    send mail to the administrator
+	    
+	    <email>rsync-admin@lists.samba.org</email>
+
+	    not to the list itself.
+	  </para>
+
+	  <para>
+	    The mailing list archives are searchable.  Use 
+	    <ulink url="http://google.com/">Google</ulink> and prepend
+	    the search with <userinput>site:lists.samba.org
+	    rsync</userinput>, plus relevant keywords.
+	  </para>
+	</answer>
+      </qandaentry>
+
+
+      <qandaentry>
+	<question>
+	  <para>
+	    Why is rsync so much bigger when I build it with
+	    <command>gcc</command>?
+	  </para>
+	</question>
+	<answer>
+	  <para>
+	    On gcc, rsync builds by default with debug symbols
+	    included.  If you strip both executables, they should end
+	    up about the same size.  (Use <command>make
+	    install-strip</command>.)
+	  </para>
+	</answer>
+      </qandaentry>
+
+      
+      <qandaentry>
+	<question>
+	  <para>Is rsync useful for a single large file like an ISO image?</para>
+	</question>
+	<answer>
+	  <para>
+	    Yes, but note the following:
+
+	  <para>
+   Background: A common use of rsync is to update a file (or set of files) in one location from a more
+   correct or up-to-date copy in another location, taking advantage of portions of the files that are
+   identical to speed up the process. (Note that rsync will transfer a file in its entirety if no copy
+   exists at the destination.)
+
+	  <para>
+   (This discussion is written in terms of updating a local copy of a file from a correct file in a
+   remote location, although rsync can work in either direction.)
+
+	  <para>
+   The file to be updated (the local file) must be in a destination directory that has enough space for
+   two copies of the file. (In addition, keep an extra copy of the file to be updated in a different
+   location for safety -- see the discussion (below) about rsync's behavior when the rsync process is
+   interrupted before completion.)
+
+	  <para>
+   The local file must have the same name as the remote file being sync'd to (I think?). If you are
+   trying to upgrade an iso from, for example, beta1 to beta2, rename the local file to the same name
+   as the beta2 file. *(This is a useful thing to do -- only the changed portions will be
+   transmitted.)*
+
+	  <para>
+   The extra copy of the local file kept in a different location is because of rsync's behavior if
+   interrupted before completion:
+
+	  <para>
+   * If you specify the --partial option and rsync is interrupted, rsync will save the partially
+   rsync'd file and throw away the original local copy. (The partially rsync'd file is correct but
+   truncated.) If rsync is restarted, it will not have a local copy of the file to check for duplicate
+   blocks beyond the section of the file that has already been rsync'd, thus the remainder of the rsync
+   process will be a "pure transfer" of the file rather than taking advantage of the rsync algorithm.
+
+	  <para>
+   * If you don't specify the --partial option and rsync is interrupted, rsync will throw away the
+   partially rsync'd file, and, when rsync is restarted starts the rsync process over from the
+   beginning.
+
+	  <para>
+   Which of these is most desirable depends on the degree of commonality between the local and remote
+   copies of the file *and how much progress was made before the interruption*.
+
+	  <para>
+   The ideal approach after an interruption would be to create a new file by taking the original file
+   and deleting a portion equal in size to the portion already rsync'd and then appending *the
+   remaining* portion to the portion of the file that has already been rsync'd. (There has been some
+   discussion about creating an option to do this automatically.)
+
+   The --compare-dest option is useful when transferring multiple files, but is of no benefit in
+   transferring a single file. (AFAIK)
+
+   *Other potentially useful information can be found at:
+   -[3]http://twiki.org/cgi-bin/view/Wikilearn/RsyncingALargeFile
+
+   This answer, formatted with "real" bullets, can be found at:
+   -[4]http://twiki.org/cgi-bin/view/Wikilearn/RsyncingALargeFileFAQ*
+
+	  </para>
+	</answer>
+      </qandaentry>
+    </qandaset>
+  </chapter>
+
+
+  <appendix>
+    <title>Other Resources</title>
+    
+    <para><ulink url="http://www.ccp14.ac.uk/ccp14admin/rsync/"></ulink></para>
+  </appendix>
+</book>
@@ -2,7 +2,7 @@
 * Error codes returned by rsync.
 *
 * Copyright (C) 1998-2000 Andrew Tridgell
- * Copyright (C) 2003-2019 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 1998 Andrew Tridgell
 * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004-2023 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,166 +20,68 @@
 */

 #include "rsync.h"
-#include "inums.h"

 #ifndef ENODATA
 #define ENODATA EAGAIN
 #endif

-/* We want all reads to be aligned on 1K boundaries. */
-#define ALIGN_BOUNDARY 1024
-/* How far past the boundary is an offset? */
-#define ALIGNED_OVERSHOOT(oft) ((oft) & (ALIGN_BOUNDARY-1))
-/* Round up a length to the next boundary */
-#define ALIGNED_LENGTH(len) ((((len) - 1) | (ALIGN_BOUNDARY-1)) + 1)
-
 extern int sparse_files;

-OFF_T preallocated_len = 0;
-
+static char last_byte;
 static OFF_T sparse_seek = 0;
-static OFF_T sparse_past_write = 0;

-int sparse_end(int f, OFF_T size, int updating_basis_or_equiv)
+int sparse_end(int f)
 {
-	int ret = 0;
+	int ret;

-	if (updating_basis_or_equiv) {
-		if (sparse_seek && vfs_punch_hole(f, sparse_past_write, sparse_seek) < 0)
-			ret = -1;
-#ifdef HAVE_FTRUNCATE /* A compilation formality -- in-place requires ftruncate() */
-		else /* Just in case the original file was longer */
-			ret = vfs_ftruncate(f, size);
-#endif
-	} else if (sparse_seek) {
-#ifdef HAVE_FTRUNCATE
-		ret = vfs_ftruncate(f, size);
-#else
-		if (vfs_lseek(f, sparse_seek-1, SEEK_CUR) != size-1)
-			ret = -1;
-		else {
-			do {
-				ret = write(f, "", 1);
-			} while (ret < 0 && errno == EINTR);
-
-			ret = ret <= 0 ? -1 : 0;
-		}
-#endif
-	}
-
-	sparse_past_write = sparse_seek = 0;
-
-	return ret;
-}
-
-/* Note that the offset is just the caller letting us know where
- * the current file position is in the file. The use_seek arg tells
- * us that we should seek over matching data instead of writing it. */
-/* Flush any deferred run of zero bytes as a hole, advancing the file
- * position past it (both vfs_lseek() and vfs_punch_hole() move the offset). */
-static int flush_sparse_hole(int f)
-{
 	if (!sparse_seek)
 		return 0;
-	if (sparse_past_write >= preallocated_len) {
-		if (vfs_lseek(f, sparse_seek, SEEK_CUR) < 0) {
-			sparse_seek = 0;
-			return -1;
-		}
-	} else if (vfs_punch_hole(f, sparse_past_write, sparse_seek) < 0) {
-		sparse_seek = 0;
-		return -1;
-	}
+
+	do_lseek(f, sparse_seek-1, SEEK_CUR);
 	sparse_seek = 0;
-	return 0;
+
+	do {
+		ret = write(f, "", 1);
+	} while (ret < 0 && errno == EINTR);
+
+	return ret <= 0 ? -1 : 0;
 }

-static int full_sparse_write(int f, const char *buf, int len)
-{
-	while (len > 0) {
-		int ret = write(f, buf, len);
-		if (ret <= 0) {
-			if (ret < 0 && errno == EINTR)
-				continue;
-			sparse_seek = 0;
-			return -1;
-		}
-		buf += ret;
-		len -= ret;
-	}
-	return 0;
-}

-/* Emit one span of data that is not being turned into a hole.  For an in-place
- * update (use_seek) the bytes on disk already match, so we only need to move
- * past them; otherwise we write them out.  Either way a deferred hole is
- * flushed first so that the span lands at the right offset. */
-static int emit_sparse_span(int f, int use_seek, const char *buf, int len)
+static int write_sparse(int f, char *buf, int len)
 {
-	if (flush_sparse_hole(f) < 0)
-		return -1;
-	if (use_seek)
-		return vfs_lseek(f, len, SEEK_CUR) < 0 ? -1 : 0;
-	return full_sparse_write(f, buf, len);
-}
+	int l1 = 0, l2 = 0;
+	int ret;

-static int write_sparse(int f, int use_seek, OFF_T offset, const char *buf, int len)
-{
-	int l1, l2, i, start, end;
-
-	/* Always treat a leading and trailing run of zeros as a (deferred)
-	 * hole, since they may merge with holes in the adjacent write calls. */
 	for (l1 = 0; l1 < len && buf[l1] == 0; l1++) {}
 	for (l2 = 0; l2 < len-l1 && buf[len-(l2+1)] == 0; l2++) {}

+	/* XXX Riddle me this: why does this function SLOW DOWN when I
+	 * remove the following (unneeded) line?? Core Duo weirdness? */
+	last_byte = buf[len-1];
+
 	sparse_seek += l1;

 	if (l1 == len)
 		return len;

-	/* Scan the middle [l1, len-l2) for interior runs of zeros that are at
-	 * least SPARSE_WRITE_SIZE long (the hole granularity rsync has always
-	 * used) and defer those as holes.  Everything in between -- which may
-	 * include shorter zero runs not worth a hole -- is emitted in one go,
-	 * rather than being chopped into SPARSE_WRITE_SIZE-byte pieces, which
-	 * made copying a large non-sparse file cost ~one write() per KiB.
-	 *
-	 * The matched (use_seek) case runs through the same scan: its interior
-	 * zero runs still have to be punched out, which is what --inplace
-	 * --sparse relies on to keep a hole-y basis file sparse. */
-	start = l1;
-	end = len - l2;
-	for (i = l1; i < end; ) {
-		int z;
-		if (buf[i] != 0) {
-			i++;
+	if (sparse_seek)
+		do_lseek(f, sparse_seek, SEEK_CUR);
+	sparse_seek = l2;
+
+	while ((ret = write(f, buf + l1, len - (l1+l2))) <= 0) {
+		if (ret < 0 && errno == EINTR)
 			continue;
-		}
-		for (z = 1; i + z < end && buf[i+z] == 0; z++) {}
-		if (z < SPARSE_WRITE_SIZE) {
-			i += z;
-			continue;
-		}
-		if (i > start) {
-			if (emit_sparse_span(f, use_seek, buf + start, i - start) < 0)
-				return -1;
-			sparse_past_write = offset + i;
-		}
-		sparse_seek += z;
-		i += z;
-		start = i;
-	}
-	if (end > start) {
-		if (emit_sparse_span(f, use_seek, buf + start, end - start) < 0)
-			return -1;
+		return ret;
 	}

-	sparse_seek = l2;
-	sparse_past_write = offset + len - l2;
+	if (ret != (int)(len - (l1+l2)))
+		return l1+ret;

 	return len;
 }

+
 static char *wf_writeBuf;
 static size_t wf_writeBufSize;
 static size_t wf_writeBufCnt;
@@ -201,26 +103,27 @@ int flush_write_file(int f)
 	return ret;
 }

-/* write_file does not allow incomplete writes.  It loops internally
- * until len bytes are written or errno is set.  Note that use_seek and
- * offset are only used in sparse processing (see write_sparse()). */
-int write_file(int f, int use_seek, OFF_T offset, const char *buf, int len)
+
+/*
+ * write_file does not allow incomplete writes.  It loops internally
+ * until len bytes are written or errno is set.
+ */
+int write_file(int f, char *buf, int len)
 {
 	int ret = 0;

 	while (len > 0) {
 		int r1;
 		if (sparse_files > 0) {
-			/* write_sparse() handles the whole span itself, scanning
-			 * for holes and coalescing the non-zero data into large
-			 * write()s instead of SPARSE_WRITE_SIZE-byte dribbles. */
-			r1 = write_sparse(f, use_seek, offset, buf, len);
-			offset += r1;
+			int len1 = MIN(len, SPARSE_WRITE_SIZE);
+			r1 = write_sparse(f, buf, len1);
 		} else {
 			if (!wf_writeBuf) {
 				wf_writeBufSize = WRITE_SIZE * 8;
 				wf_writeBufCnt  = 0;
 				wf_writeBuf = new_array(char, wf_writeBufSize);
+				if (!wf_writeBuf)
+					out_of_memory("write_file");
 			}
 			r1 = (int)MIN((size_t)len, wf_writeBufSize - wf_writeBufCnt);
 			if (r1) {
@@ -246,47 +149,25 @@ int write_file(int f, int use_seek, OFF_T offset, const char *buf, int len)
 	return ret;
 }

-/* An in-place update found identical data at an identical location. We either
- * just seek past it, or (for an in-place sparse update), we give the data to
- * the sparse processor with the use_seek flag set. */
-int skip_matched(int fd, OFF_T offset, const char *buf, int len)
-{
-	OFF_T pos;
-
-	if (sparse_files > 0) {
-		if (write_file(fd, 1, offset, buf, len) != len)
-			return -1;
-		return 0;
-	}
-
-	if (flush_write_file(fd) < 0)
-		return -1;
-
-	if ((pos = vfs_lseek(fd, len, SEEK_CUR)) != offset + len) {
-		rsyserr(FERROR_XFER, errno, "lseek returned %s, not %s",
-			big_num(pos), big_num(offset));
-		return -1;
-	}
-
-	return 0;
-}

 /* This provides functionality somewhat similar to mmap() but using read().
 * It gives sliding window access to a file.  mmap() is not used because of
 * the possibility of another program (such as a mailer) truncating the
 * file thus giving us a SIGBUS. */
-struct map_struct *map_file(int fd, OFF_T len, int32 read_size, int32 blk_size)
+struct map_struct *map_file(int fd, OFF_T len, int32 read_size,
+			    int32 blk_size)
 {
 	struct map_struct *map;

-	map = new0(struct map_struct);
+	if (!(map = new0(struct map_struct)))
+		out_of_memory("map_file");

 	if (blk_size && (read_size % blk_size))
 		read_size += blk_size - (read_size % blk_size);

 	map->fd = fd;
 	map->file_size = len;
-	map->def_window_size = ALIGNED_LENGTH(read_size);
+	map->def_window_size = read_size;

 	return map;
 }
@@ -295,8 +176,9 @@ struct map_struct *map_file(int fd, OFF_T len, int32 read_size, int32 blk_size)
 /* slide the read window in the file */
 char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
 {
+	int32 nread;
 	OFF_T window_start, read_start;
-	int32 window_size, read_size, read_offset, align_fudge;
+	int32 window_size, read_size, read_offset;

 	if (len == 0)
 		return NULL;
@@ -311,23 +193,26 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
 		return map->p + (offset - map->p_offset);

 	/* nope, we are going to have to do a read. Work out our desired window */
-	align_fudge = (int32)ALIGNED_OVERSHOOT(offset);
-	window_start = offset - align_fudge;
+	window_start = offset;
 	window_size = map->def_window_size;
 	if (window_start + window_size > map->file_size)
 		window_size = (int32)(map->file_size - window_start);
-	if (window_size < len + align_fudge)
-		window_size = ALIGNED_LENGTH(len + align_fudge);
+	if (len > window_size)
+		window_size = len;

 	/* make sure we have allocated enough memory for the window */
 	if (window_size > map->p_size) {
 		map->p = realloc_array(map->p, char, window_size);
+		if (!map->p)
+			out_of_memory("map_ptr");
 		map->p_size = window_size;
 	}

-	/* Now try to avoid re-reading any bytes by reusing any bytes from the previous buffer. */
-	if (window_start >= map->p_offset && window_start < map->p_offset + map->p_len
-	 && window_start + window_size >= map->p_offset + map->p_len) {
+	/* Now try to avoid re-reading any bytes by reusing any bytes
+	 * from the previous buffer. */
+	if (window_start >= map->p_offset &&
+	    window_start < map->p_offset + map->p_len &&
+	    window_start + window_size >= map->p_offset + map->p_len) {
 		read_start = map->p_offset + map->p_len;
 		read_offset = (int32)(read_start - window_start);
 		read_size = window_size - read_offset;
@@ -345,10 +230,10 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
 	}

 	if (map->p_fd_offset != read_start) {
-		OFF_T ret = vfs_lseek(map->fd, read_start, SEEK_SET);
+		OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);
 		if (ret != read_start) {
-			rsyserr(FERROR, errno, "lseek returned %s, not %s",
-				big_num(ret), big_num(read_start));
+			rsyserr(FERROR, errno, "lseek returned %.0f, not %.0f",
+				(double)ret, (double)read_start);
 			exit_cleanup(RERR_FILEIO);
 		}
 		map->p_fd_offset = read_start;
@@ -357,7 +242,7 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
 	map->p_len = window_size;

 	while (read_size > 0) {
-		int32 nread = read(map->fd, map->p + read_offset, read_size);
+		nread = read(map->fd, map->p + read_offset, read_size);
 		if (nread <= 0) {
 			if (!map->status)
 				map->status = nread ? errno : ENODATA;
@@ -371,9 +256,10 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
 		read_size -= nread;
 	}

-	return map->p + align_fudge;
+	return map->p;
 }

+
 int unmap_file(struct map_struct *map)
 {
 	int	ret;
@@ -383,9 +269,7 @@ int unmap_file(struct map_struct *map)
 		map->p = NULL;
 	}
 	ret = map->status;
-#if 0 /* I don't think we really need this. */
-	force_memzero(map, sizeof map[0]);
-#endif
+	memset(map, 0, sizeof map[0]);
 	free(map);

 	return ret;
@@ -15,7 +15,8 @@
 			fprintf(stderr, "Unable to stat `%s'\n", *argv);
 			exit(1);
 		}
-		printf("%ld/%ld\n", (long)major(st.st_dev), (long)minor(st.st_dev));
+		printf("%ld/%ld\n", (long)major(st.st_dev),
+				    (long)minor(st.st_dev));
 	}

 	return 0;
@@ -3,7 +3,7 @@
 * `id -G` on Linux, but it's too hard to find a portable equivalent.
 *
 * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2020 Wayne Davison
+ * Copyright (C) 2003-2008 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 3 as
@@ -20,7 +20,8 @@

 #include "rsync.h"

- int main(UNUSED(int argc), UNUSED(char *argv[]))
+int
+main(UNUSED(int argc), UNUSED(char *argv[]))
 {
 	int n, i;
 	gid_t *list;
@@ -57,6 +58,5 @@
 		printf("%lu", (unsigned long)gid);
 	printf("\n");

-	free(list);
 	return 0;
 }
@@ -1,7 +1,7 @@
 /*
 * Routines to provide a memory-efficient hashtable.
 *
- * Copyright (C) 2007-2022 Wayne Davison
+ * Copyright (C) 2007-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,115 +19,64 @@

 #include "rsync.h"

-#define HASH_LOAD_LIMIT(size) ((size)/4*3)	/* /4 first: never overflows int */
+#define HASH_LOAD_LIMIT(size) ((size)*3/4)

 struct hashtable *hashtable_create(int size, int key64)
 {
-	int req = size;
 	struct hashtable *tbl;
 	int node_size = key64 ? sizeof (struct ht_int64_node)
 			      : sizeof (struct ht_int32_node);

-	/* Pick a power of 2 that can hold the requested size.  Test size < 16 first
-	 * so a negative/zero req short-circuits before the size-1 (INT_MIN is UB). */
-	if (size < 16 || (size & (size-1))) {
+	/* Pick a power of 2 that can hold the requested size. */
+	if (size & (size-1) || size < 16) {
+		int req = size;
 		size = 16;
-		while (size < req) {
-			if (size > INT_MAX/2) {	/* the next doubling would overflow int */
-				rprintf(FERROR, "[%s] hashtable_create: requested size %d is too large\n",
-					who_am_i(), req);
-				exit_cleanup(RERR_MALLOC);
-			}
+		while (size < req)
 			size *= 2;
-		}
 	}

-	tbl = new(struct hashtable);
-	/* Pass size and node_size as SEPARATE factors so my_alloc's overflow /
-	 * --max-alloc guard sees both; computing size*node_size as int would wrap to
-	 * a tiny count and under-allocate (heap overflow on later node access). */
-	tbl->nodes = my_alloc(do_calloc, size, node_size, __FILE__, __LINE__);
+	if (!(tbl = new(struct hashtable))
+	 || !(tbl->nodes = new_array0(char, size * node_size)))
+		out_of_memory("hashtable_create");
 	tbl->size = size;
 	tbl->entries = 0;
 	tbl->node_size = node_size;
-	tbl->key64 = key64 ? 1 : 0;
-
-	if (DEBUG_GTE(HASH, 1)) {
-		char buf[32];
-		if (req != size)
-			snprintf(buf, sizeof buf, "req: %d, ", req);
-		else
-			*buf = '\0';
-		rprintf(FINFO, "[%s] created hashtable %lx (%ssize: %d, keys: %d-bit)\n",
-			who_am_i(), (long)tbl, buf, size, key64 ? 64 : 32);
-	}
+	tbl->key64 = key64;

 	return tbl;
 }

 void hashtable_destroy(struct hashtable *tbl)
 {
-	if (DEBUG_GTE(HASH, 1)) {
-		rprintf(FINFO, "[%s] destroyed hashtable %lx (size: %d, keys: %d-bit)\n",
-			who_am_i(), (long)tbl, tbl->size, tbl->key64 ? 64 : 32);
-	}
 	free(tbl->nodes);
 	free(tbl);
 }

-/* Returns the node that holds the indicated key if it exists. When it does not
- * exist, it returns either NULL (when data_when_new is NULL), or it returns a
- * new node with its node->data set to the indicated value.
- *
- * If your code doesn't know the data value for a new node in advance (usually
- * because it doesn't know if a node is new or not) you should pass in a unique
- * (non-0) value that you can use to check if the returned node is new. You can
- * then overwrite the data with any value you want (even 0) since it only needs
- * to be different than whatever data_when_new value you use later on.
- *
- * This return is a void* just because it might be pointing at a ht_int32_node
- * or a ht_int64_node, and that makes the caller's assignment a little easier. */
-void *hashtable_find(struct hashtable *tbl, int64 key, void *data_when_new)
+/* This returns the node for the indicated key, either newly created or
+ * already existing.  Returns NULL if not allocating and not found. */
+void *hashtable_find(struct hashtable *tbl, int64 key, int allocate_if_missing)
 {
 	int key64 = tbl->key64;
 	struct ht_int32_node *node;
 	uint32 ndx;

-	if (key64 ? key == 0 : (int32)key == 0) {
-		rprintf(FERROR, "Internal hashtable error: illegal key supplied!\n");
-		exit_cleanup(RERR_MESSAGEIO);
-	}
-
-	if (data_when_new && tbl->entries > HASH_LOAD_LIMIT(tbl->size)) {
+	if (allocate_if_missing && tbl->entries > HASH_LOAD_LIMIT(tbl->size)) {
 		void *old_nodes = tbl->nodes;
-		int size, i;
+		int size = tbl->size * 2;
+		int i;

-		if (tbl->size > INT_MAX/2) {	/* doubling would overflow int */
-			rprintf(FERROR, "[%s] hashtable grow: size overflow\n", who_am_i());
-			exit_cleanup(RERR_MALLOC);
-		}
-		size = tbl->size * 2;
-		/* Separate factors so my_alloc's guard sees both (see hashtable_create). */
-		tbl->nodes = my_alloc(do_calloc, size, tbl->node_size, __FILE__, __LINE__);
+		if (!(tbl->nodes = new_array0(char, size * tbl->node_size)))
+			out_of_memory("hashtable_node");
 		tbl->size = size;
 		tbl->entries = 0;

-		if (DEBUG_GTE(HASH, 1)) {
-			rprintf(FINFO, "[%s] growing hashtable %lx (size: %d, keys: %d-bit)\n",
-				who_am_i(), (long)tbl, size, key64 ? 64 : 32);
-		}
-
 		for (i = size / 2; i-- > 0; ) {
 			struct ht_int32_node *move_node = HT_NODE(tbl, old_nodes, i);
 			int64 move_key = HT_KEY(move_node, key64);
 			if (move_key == 0)
 				continue;
-			if (move_node->data)
-				hashtable_find(tbl, move_key, move_node->data);
-			else {
-				node = hashtable_find(tbl, move_key, "");
-				node->data = 0;
-			}
+			node = hashtable_find(tbl, move_key, 1);
+			node->data = move_node->data;
 		}

 		free(old_nodes);
@@ -135,10 +84,10 @@ void *hashtable_find(struct hashtable *tbl, int64 key, void *data_when_new)

 	if (!key64) {
 		/* Based on Jenkins One-at-a-time hash. */
-		uchar buf[4] = {0}, *keyp = buf; /* {0} only to satisfy the analyzer (SIVALu fills buf) */
+		uchar buf[4], *keyp = buf;
 		int i;

-		SIVALu(buf, 0, key);
+		SIVAL(buf, 0, key);
 		for (ndx = 0, i = 0; i < 4; i++) {
 			ndx += keyp[i];
 			ndx += (ndx << 10);
@@ -182,7 +131,7 @@ void *hashtable_find(struct hashtable *tbl, int64 key, void *data_when_new)
 		if (nkey == key)
 			return node;
 		if (nkey == 0) {
-			if (!data_when_new)
+			if (!allocate_if_missing)
 				return NULL;
 			break;
 		}
@@ -193,485 +142,7 @@ void *hashtable_find(struct hashtable *tbl, int64 key, void *data_when_new)
 	if (key64)
 		((struct ht_int64_node*)node)->key = key;
 	else
-		node->key = (int32)key;
-	node->data = data_when_new;
+		node->key = key;
 	tbl->entries++;
 	return node;
 }
-
-#ifndef WORDS_BIGENDIAN
-# define HASH_LITTLE_ENDIAN 1
-# define HASH_BIG_ENDIAN 0
-#else
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 1
-#endif
-
-/*
- -------------------------------------------------------------------------------
- lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-
- These are functions for producing 32-bit hashes for hash table lookup.
- hash_word(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
- are externally useful functions.  Routines to test the hash are included
- if SELF_TEST is defined.  You can use this free for any purpose.  It's in
- the public domain.  It has no warranty.
-
- You probably want to use hashlittle().  hashlittle() and hashbig()
- hash byte arrays.  hashlittle() is is faster than hashbig() on
- little-endian machines.  Intel and AMD are little-endian machines.
- On second thought, you probably want hashlittle2(), which is identical to
- hashlittle() except it returns two 32-bit hashes for the price of one.
- You could implement hashbig2() if you wanted but I haven't bothered here.
-
- If you want to find a hash of, say, exactly 7 integers, do
-   a = i1;  b = i2;  c = i3;
-   mix(a,b,c);
-   a += i4; b += i5; c += i6;
-   mix(a,b,c);
-   a += i7;
-   final(a,b,c);
- then use c as the hash value.  If you have a variable length array of
- 4-byte integers to hash, use hash_word().  If you have a byte array (like
- a character string), use hashlittle().  If you have several byte arrays, or
- a mix of things, see the comments above hashlittle().
-
- Why is this so big?  I read 12 bytes at a time into 3 4-byte integers,
- then mix those integers.  This is fast (you can do a lot more thorough
- mixing with 12*3 instructions on 3 integers than you can with 3 instructions
- on 1 byte), but shoehorning those bytes into integers efficiently is messy.
-*/
-
-#define hashsize(n) ((uint32_t)1<<(n))
-#define hashmask(n) (hashsize(n)-1)
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-
-/*
- -------------------------------------------------------------------------------
- mix -- mix 3 32-bit values reversibly.
-
- This is reversible, so any information in (a,b,c) before mix() is
- still in (a,b,c) after mix().
-
- If four pairs of (a,b,c) inputs are run through mix(), or through
- mix() in reverse, there are at least 32 bits of the output that
- are sometimes the same for one pair and different for another pair.
- This was tested for:
- * pairs that differed by one bit, by two bits, in any combination
-   of top bits of (a,b,c), or in any combination of bottom bits of
-   (a,b,c).
- * "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-   is commonly produced by subtraction) look like a single 1-bit
-   difference.
- * the base values were pseudorandom, all zero but one bit set, or
-   all zero plus a counter that starts at zero.
-
- Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
- satisfy this are
-     4  6  8 16 19  4
-     9 15  3 18 27 15
-    14  9  3  7 17  3
- Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
- for "differ" defined as + with a one-bit base and a two-bit delta.  I
- used http://burtleburtle.net/bob/hash/avalanche.html to choose
- the operations, constants, and arrangements of the variables.
-
- This does not achieve avalanche.  There are input bits of (a,b,c)
- that fail to affect some output bits of (a,b,c), especially of a.  The
- most thoroughly mixed value is c, but it doesn't really even achieve
- avalanche in c.
-
- This allows some parallelism.  Read-after-writes are good at doubling
- the number of bits affected, so the goal of mixing pulls in the opposite
- direction as the goal of parallelism.  I did what I could.  Rotates
- seem to cost as much as shifts on every machine I could lay my hands
- on, and rotates are much kinder to the top and bottom bits, so I used
- rotates.
- -------------------------------------------------------------------------------
-*/
-#define mix(a,b,c) \
-{ \
-  a -= c;  a ^= rot(c, 4);  c += b; \
-  b -= a;  b ^= rot(a, 6);  a += c; \
-  c -= b;  c ^= rot(b, 8);  b += a; \
-  a -= c;  a ^= rot(c,16);  c += b; \
-  b -= a;  b ^= rot(a,19);  a += c; \
-  c -= b;  c ^= rot(b, 4);  b += a; \
-}
-
-/*
- -------------------------------------------------------------------------------
- final -- final mixing of 3 32-bit values (a,b,c) into c
-
- Pairs of (a,b,c) values differing in only a few bits will usually
- produce values of c that look totally different.  This was tested for
- * pairs that differed by one bit, by two bits, in any combination
-   of top bits of (a,b,c), or in any combination of bottom bits of
-   (a,b,c).
- * "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-   is commonly produced by subtraction) look like a single 1-bit
-   difference.
- * the base values were pseudorandom, all zero but one bit set, or
-   all zero plus a counter that starts at zero.
-
- These constants passed:
-  14 11 25 16 4 14 24
-  12 14 25 16 4 14 24
- and these came close:
-   4  8 15 26 3 22 24
-  10  8 15 26 3 22 24
-  11  8 15 26 3 22 24
- -------------------------------------------------------------------------------
-*/
-#define final(a,b,c) \
-{ \
-  c ^= b; c -= rot(b,14); \
-  a ^= c; a -= rot(c,11); \
-  b ^= a; b -= rot(a,25); \
-  c ^= b; c -= rot(b,16); \
-  a ^= c; a -= rot(c,4);  \
-  b ^= a; b -= rot(a,14); \
-  c ^= b; c -= rot(b,24); \
-}
-
-
-/*
- -------------------------------------------------------------------------------
- hashlittle() -- hash a variable-length key into a 32-bit value
-   k       : the key (the unaligned variable-length array of bytes)
-   length  : the length of the key, counting by bytes
-   val2    : IN: can be any 4-byte value OUT: second 32 bit hash.
- Returns a 32-bit value.  Every bit of the key affects every bit of
- the return value.  Two keys differing by one or two bits will have
- totally different hash values.  Note that the return value is better
- mixed than val2, so use that first.
-
- The best hash table sizes are powers of 2.  There is no need to do
- mod a prime (mod is sooo slow!).  If you need less than 32 bits,
- use a bitmask.  For example, if you need only 10 bits, do
-   h = (h & hashmask(10));
- In which case, the hash table should have hashsize(10) elements.
-
- If you are hashing n strings (uint8_t **)k, do it like this:
-   for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
-
- By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
- code any way you wish, private, educational, or commercial.  It's free.
-
- Use for hash table lookup, or anything where one collision in 2^^32 is
- acceptable.  Do NOT use for cryptographic purposes.
- -------------------------------------------------------------------------------
-*/
-
-#define NON_ZERO_32(x) ((x) ? (x) : (uint32_t)1)
-#define NON_ZERO_64(x, y) ((x) || (y) ? (y) | (uint64_t)(x) << 32 | (y) : (int64)1)
-
-uint32_t hashlittle(const void *key, size_t length)
-{
-  uint32_t a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length);
-
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
-    case 9 : c+=k8[8];                   /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
-    case 5 : b+=k8[4];                   /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
-    case 1 : a+=k8[0]; break;
-    case 0 : return NON_ZERO_32(c);
-    }
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
-    const uint8_t  *k8;
-
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((uint32_t)k[1])<<16);
-      b += k[2] + (((uint32_t)k[3])<<16);
-      c += k[4] + (((uint32_t)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
-    case 10: c+=k[4];
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];                      /* fall through */
-    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
-    case 6 : b+=k[2];
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];                      /* fall through */
-    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : return NON_ZERO_32(c);         /* zero length requires no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((uint32_t)k[1])<<8;
-      a += ((uint32_t)k[2])<<16;
-      a += ((uint32_t)k[3])<<24;
-      b += k[4];
-      b += ((uint32_t)k[5])<<8;
-      b += ((uint32_t)k[6])<<16;
-      b += ((uint32_t)k[7])<<24;
-      c += k[8];
-      c += ((uint32_t)k[9])<<8;
-      c += ((uint32_t)k[10])<<16;
-      c += ((uint32_t)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((uint32_t)k[11])<<24;
-	     /* FALLTHROUGH */
-    case 11: c+=((uint32_t)k[10])<<16;
-	     /* FALLTHROUGH */
-    case 10: c+=((uint32_t)k[9])<<8;
-	     /* FALLTHROUGH */
-    case 9 : c+=k[8];
-	     /* FALLTHROUGH */
-    case 8 : b+=((uint32_t)k[7])<<24;
-	     /* FALLTHROUGH */
-    case 7 : b+=((uint32_t)k[6])<<16;
-	     /* FALLTHROUGH */
-    case 6 : b+=((uint32_t)k[5])<<8;
-	     /* FALLTHROUGH */
-    case 5 : b+=k[4];
-	     /* FALLTHROUGH */
-    case 4 : a+=((uint32_t)k[3])<<24;
-	     /* FALLTHROUGH */
-    case 3 : a+=((uint32_t)k[2])<<16;
-	     /* FALLTHROUGH */
-    case 2 : a+=((uint32_t)k[1])<<8;
-	     /* FALLTHROUGH */
-    case 1 : a+=k[0];
-             break;
-    case 0 : return NON_ZERO_32(c);
-    }
-  }
-
-  final(a,b,c);
-  return NON_ZERO_32(c);
-}
-
-#if SIZEOF_INT64 >= 8
-/*
- * hashlittle2: return 2 32-bit hash values joined into an int64.
- *
- * This is identical to hashlittle(), except it returns two 32-bit hash
- * values instead of just one.  This is good enough for hash table
- * lookup with 2^^64 buckets, or if you want a second hash if you're not
- * happy with the first, or if you want a probably-unique 64-bit ID for
- * the key.  *pc is better mixed than *pb, so use *pc first.  If you want
- * a 64-bit value do something like "*pc + (((uint64_t)*pb)<<32)".
- */
-int64 hashlittle2(const void *key, size_t length)
-{
-  uint32_t a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length);
-
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
-    case 9 : c+=k8[8];                   /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
-    case 5 : b+=k8[4];                   /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
-    case 1 : a+=k8[0]; break;
-    case 0 : return NON_ZERO_64(b, c);
-    }
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
-    const uint8_t  *k8;
-
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((uint32_t)k[1])<<16);
-      b += k[2] + (((uint32_t)k[3])<<16);
-      c += k[4] + (((uint32_t)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
-    case 10: c+=k[4];
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];                      /* fall through */
-    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
-    case 6 : b+=k[2];
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];                      /* fall through */
-    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : return NON_ZERO_64(b, c);  /* zero length strings require no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((uint32_t)k[1])<<8;
-      a += ((uint32_t)k[2])<<16;
-      a += ((uint32_t)k[3])<<24;
-      b += k[4];
-      b += ((uint32_t)k[5])<<8;
-      b += ((uint32_t)k[6])<<16;
-      b += ((uint32_t)k[7])<<24;
-      c += k[8];
-      c += ((uint32_t)k[9])<<8;
-      c += ((uint32_t)k[10])<<16;
-      c += ((uint32_t)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((uint32_t)k[11])<<24;
-	     /* FALLTHROUGH */
-    case 11: c+=((uint32_t)k[10])<<16;
-	     /* FALLTHROUGH */
-    case 10: c+=((uint32_t)k[9])<<8;
-	     /* FALLTHROUGH */
-    case 9 : c+=k[8];
-	     /* FALLTHROUGH */
-    case 8 : b+=((uint32_t)k[7])<<24;
-	     /* FALLTHROUGH */
-    case 7 : b+=((uint32_t)k[6])<<16;
-	     /* FALLTHROUGH */
-    case 6 : b+=((uint32_t)k[5])<<8;
-	     /* FALLTHROUGH */
-    case 5 : b+=k[4];
-	     /* FALLTHROUGH */
-    case 4 : a+=((uint32_t)k[3])<<24;
-	     /* FALLTHROUGH */
-    case 3 : a+=((uint32_t)k[2])<<16;
-	     /* FALLTHROUGH */
-    case 2 : a+=((uint32_t)k[1])<<8;
-	     /* FALLTHROUGH */
-    case 1 : a+=k[0];
-             break;
-    case 0 : return NON_ZERO_64(b, c);
-    }
-  }
-
-  final(a,b,c);
-  return NON_ZERO_64(b, c);
-}
-#else
-#define hashlittle2(key, len) hashlittle(key, len)
-#endif
@@ -1,40 +0,0 @@
-#!/usr/bin/awk -f
-
-# The caller must pass args: -v hfile=help-NAME.h NAME.NUM.md
-
-BEGIN {
-    heading = "/* DO NOT EDIT THIS FILE!  It is auto-generated from the option list in " ARGV[1] "! */"
-    findcomment = hfile
-    sub("\\.", "\\.", findcomment)
-    findcomment = "\\[comment\\].*" findcomment
-    backtick_cnt = 0
-    prints = ""
-}
-
-/^```/ {
-    backtick_cnt++
-    next
-}
-
-foundcomment {
-    if (backtick_cnt > 1) exit
-    if (backtick_cnt == 1) {
-	gsub(/"/, "\\\"")
-	prints = prints "\n  rprintf(F,\"" $0 "\\n\");"
-    }
-    next
-}
-
-$0 ~ findcomment {
-    foundcomment = 1
-    backtick_cnt = 0
-}
-
-END {
-    if (foundcomment && backtick_cnt > 1)
-	print heading "\n" prints > hfile
-    else {
-	print "Failed to find " hfile " section in " ARGV[1]
-	exit 1
-    }
-}
@@ -4,7 +4,7 @@
 * Copyright (C) 1996 Andrew Tridgell
 * Copyright (C) 1996 Paul Mackerras
 * Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2004-2022 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,23 +21,23 @@
 */

 #include "rsync.h"
-#include "inums.h"
-#include "ifuncs.h"

+extern int verbose;
 extern int dry_run;
 extern int list_only;
 extern int am_sender;
 extern int inc_recurse;
 extern int do_xfers;
-extern int alt_dest_type;
+extern int link_dest;
 extern int preserve_acls;
 extern int preserve_xattrs;
+extern int make_backups;
 extern int protocol_version;
 extern int remove_source_files;
 extern int stdout_format_has_i;
 extern int maybe_ATTRS_REPORT;
 extern int unsort_ndx;
-extern char *basis_dir[MAX_BASIS_DIRS+1];
+extern char *basis_dir[];
 extern struct file_list *cur_flist;

 #ifdef SUPPORT_HARD_LINKS
@@ -48,8 +48,6 @@ extern struct file_list *cur_flist;
 * we can avoid the pool of dev+inode data.  For incremental recursion mode,
 * the receiver will use a ndx hash to remember old pathnames. */

-static void *data_when_new = "";
-
 static struct hashtable *dev_tbl;

 static struct hashtable *prior_hlinks;
@@ -59,29 +57,25 @@ static struct file_list *hlink_flist;
 void init_hard_links(void)
 {
 	if (am_sender || protocol_version < 30)
-		dev_tbl = hashtable_create(16, HT_KEY64);
+		dev_tbl = hashtable_create(16, SIZEOF_INT64 == 8);
 	else if (inc_recurse)
-		prior_hlinks = hashtable_create(1024, HT_KEY32);
+		prior_hlinks = hashtable_create(1024, 0);
 }

 struct ht_int64_node *idev_find(int64 dev, int64 ino)
 {
 	static struct ht_int64_node *dev_node = NULL;
+	struct hashtable *tbl;

-	/* Note that some OSes have a dev == 0, so increment to avoid storing a 0. */
-	if (!dev_node || dev_node->key != dev+1) {
+	if (!dev_node || dev_node->key != dev) {
 		/* We keep a separate hash table of inodes for every device. */
-		dev_node = hashtable_find(dev_tbl, dev+1, data_when_new);
-		if (dev_node->data == data_when_new) {
-			dev_node->data = hashtable_create(512, HT_KEY64);
-			if (DEBUG_GTE(HLINK, 3)) {
-				rprintf(FINFO, "[%s] created hashtable for dev %s\n",
-					who_am_i(), big_num(dev));
-			}
-		}
-	}
+		dev_node = hashtable_find(dev_tbl, dev, 1);
+		if (!(tbl = dev_node->data))
+			tbl = dev_node->data = hashtable_create(512, SIZEOF_INT64 == 8);
+	} else
+		tbl = dev_node->data;

-	return hashtable_find(dev_node->data, ino, (void*)-1L);
+	return hashtable_find(tbl, ino, 1);
 }

 void idev_destroy(void)
@@ -117,30 +111,18 @@ static void match_gnums(int32 *ndx_list, int ndx_count)
 	struct ht_int32_node *node = NULL;
 	int32 gnum, gnum_next;

-	qsort(ndx_list, ndx_count, sizeof ndx_list[0], (int (*)(const void*, const void*))hlink_compare_gnum);
+	qsort(ndx_list, ndx_count, sizeof ndx_list[0],
+	     (int (*)()) hlink_compare_gnum);

 	for (from = 0; from < ndx_count; from++) {
 		file = hlink_flist->sorted[ndx_list[from]];
 		gnum = F_HL_GNUM(file);
 		if (inc_recurse) {
-			node = hashtable_find(prior_hlinks, gnum, data_when_new);
-			if (node->data == data_when_new) {
-				if (gnum < hlink_flist->ndx_start) {
-					/* A non-first hard-link entry whose
-					 * gnum points before this flist's
-					 * ndx_start should already have been
-					 * recorded in prior_hlinks by an
-					 * earlier flist.  A peer that sends
-					 * such a back-reference on the first
-					 * flist (or to a gnum that was never
-					 * declared XMIT_HLINK_FIRST) is
-					 * misbehaving. */
-					rprintf(FERROR,
-					    "hard-link gnum %d precedes flist start %d\n",
-					    (int)gnum, (int)hlink_flist->ndx_start);
-					exit_cleanup(RERR_PROTOCOL);
-				}
-				node->data = new_array0(char, 5);
+			node = hashtable_find(prior_hlinks, gnum, 1);
+			if (!node->data) {
+				if (!(node->data = new_array0(char, 5)))
+					out_of_memory("match_gnums");
+				assert(gnum >= hlink_flist->ndx_start);
 				file->flags |= FLAG_HLINK_FIRST;
 				prev = -1;
 			} else if (CVAL(node->data, 0) == 0) {
@@ -203,7 +185,8 @@ void match_hard_links(struct file_list *flist)
 		int i, ndx_count = 0;
 		int32 *ndx_list;

-		ndx_list = new_array(int32, flist->used);
+		if (!(ndx_list = new_array(int32, flist->used)))
+			out_of_memory("match_hard_links");

 		for (i = 0; i < flist->used; i++) {
 			if (F_IS_HLINKED(flist->sorted[i]))
@@ -222,7 +205,7 @@ void match_hard_links(struct file_list *flist)
 }

 static int maybe_hard_link(struct file_struct *file, int ndx,
-			   char *fname, int statret, stat_x *sxp,
+			   const char *fname, int statret, stat_x *sxp,
 			   const char *oldname, STRUCT_STAT *old_stp,
 			   const char *realname, int itemizing, enum logcode code)
 {
@@ -234,24 +217,31 @@ static int maybe_hard_link(struct file_struct *file, int ndx,
 					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
 					0, "");
 			}
-			if (INFO_GTE(NAME, 2) && maybe_ATTRS_REPORT)
+			if (verbose > 1 && maybe_ATTRS_REPORT)
 				rprintf(FCLIENT, "%s is uptodate\n", fname);
 			file->flags |= FLAG_HLINK_DONE;
 			return 0;
 		}
+		if (make_backups > 0) {
+			if (!make_backup(fname))
+				return -1;
+		} else if (robust_unlink(fname)) {
+			rsyserr(FERROR_XFER, errno, "unlink %s failed",
+				full_fname(fname));
+			return -1;
+		}
 	}

-	if (atomic_create(file, fname, NULL, oldname, MAKEDEV(0, 0), sxp, statret == 0 ? DEL_FOR_FILE : 0)) {
+	if (hard_link_one(file, fname, oldname, 0)) {
 		if (itemizing) {
 			itemize(fname, file, ndx, statret, sxp,
 				ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
 				realname);
 		}
-		if (code != FNONE && INFO_GTE(NAME, 1))
+		if (code != FNONE && verbose)
 			rprintf(code, "%s => %s\n", fname, realname);
 		return 0;
 	}
-
 	return -1;
 }

@@ -279,7 +269,7 @@ static char *check_prior(struct file_struct *file, int gnum,
 	}

 	if (inc_recurse
-	 && (node = hashtable_find(prior_hlinks, gnum, NULL)) != NULL) {
+	 && (node = hashtable_find(prior_hlinks, gnum, 0)) != NULL) {
 		assert(node->data != NULL);
 		if (CVAL(node->data, 0) != 0) {
 			*prev_ndx_p = -1;
@@ -297,7 +287,7 @@ static char *check_prior(struct file_struct *file, int gnum,

 /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not.  Returns:
 * 0 = process the file, 1 = skip the file, -1 = error occurred. */
-int hard_link_check(struct file_struct *file, int ndx, char *fname,
+int hard_link_check(struct file_struct *file, int ndx, const char *fname,
 		    int statret, stat_x *sxp, int itemizing,
 		    enum logcode code)
 {
@@ -316,10 +306,6 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		if (!flist) {
 			/* The previous file was skipped, so this one is
 			 * treated as if it were the first in its group. */
-			if (DEBUG_GTE(HLINK, 2)) {
-				rprintf(FINFO, "hlink for %d (%s,%d): virtual first\n",
-					ndx, f_name(file, NULL), gnum);
-			}
 			return 0;
 		}

@@ -336,16 +322,8 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 				F_HL_PREV(prev_file) = ndx;
 				file->flags |= FLAG_FILE_SENT;
 				cur_flist->in_progress++;
-				if (DEBUG_GTE(HLINK, 2)) {
-					rprintf(FINFO, "hlink for %d (%s,%d): waiting for %d\n",
-						ndx, f_name(file, NULL), gnum, F_HL_PREV(file));
-				}
 				return 1;
 			}
-			if (DEBUG_GTE(HLINK, 2)) {
-				rprintf(FINFO, "hlink for %d (%s,%d): looking for a leader\n",
-					ndx, f_name(file, NULL), gnum);
-			}
 			return 0;
 		}

@@ -353,6 +331,7 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		if (!(prev_file->flags & FLAG_HLINK_FIRST)) {
 			/* The previous previous is FIRST when prev is not. */
 			prev_name = realname = check_prior(prev_file, gnum, &prev_ndx, &flist);
+			assert(prev_name != NULL || flist != NULL);
 			/* Update our previous pointer to point to the FIRST. */
 			F_HL_PREV(file) = prev_ndx;
 		}
@@ -360,14 +339,9 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		if (!prev_name) {
 			int alt_dest;

-			assert(flist != NULL);
 			prev_file = flist->files[prev_ndx - flist->ndx_start];
 			/* F_HL_PREV() is alt_dest value when DONE && FIRST. */
 			alt_dest = F_HL_PREV(prev_file);
-			if (DEBUG_GTE(HLINK, 2)) {
-				rprintf(FINFO, "hlink for %d (%s,%d): found flist match (alt %d)\n",
-					ndx, f_name(file, NULL), gnum, alt_dest);
-			}

 			if (alt_dest >= 0 && dry_run) {
 				pathjoin(namebuf, MAXPATHLEN, basis_dir[alt_dest],
@@ -381,19 +355,10 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		}
 	}

-	if (DEBUG_GTE(HLINK, 2)) {
-		rprintf(FINFO, "hlink for %d (%s,%d): leader is %d (%s)\n",
-			ndx, f_name(file, NULL), gnum, prev_ndx, prev_name);
-	}
-
 	if (link_stat(prev_name, &prev_st, 0) < 0) {
-		if (!dry_run || errno != ENOENT) {
-			rsyserr(FERROR_XFER, errno, "stat %s failed", full_fname(prev_name));
-			return -1;
-		}
-		/* A new hard-link will get a new dev & inode, so approximate
-		 * those values in dry-run mode by zeroing them. */
-		memset(&prev_st, 0, sizeof prev_st);
+		rsyserr(FERROR_XFER, errno, "stat %s failed",
+			full_fname(prev_name));
+		return -1;
 	}

 	if (statret < 0 && basis_dir[0] != NULL) {
@@ -401,33 +366,31 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		char cmpbuf[MAXPATHLEN];
 		stat_x alt_sx;
 		int j = 0;
-		init_stat_x(&alt_sx);
+#ifdef SUPPORT_ACLS
+		alt_sx.acc_acl = alt_sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+		alt_sx.xattr = NULL;
+#endif
 		do {
 			pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
 			if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
 				continue;
-			if (alt_dest_type == LINK_DEST) {
+			if (link_dest) {
 				if (prev_st.st_dev != alt_sx.st.st_dev
 				 || prev_st.st_ino != alt_sx.st.st_ino)
 					continue;
 				statret = 1;
 				if (stdout_format_has_i == 0
-				 || (!INFO_GTE(NAME, 2) && stdout_format_has_i < 2)) {
+				 || (verbose < 2 && stdout_format_has_i < 2)) {
 					itemizing = 0;
 					code = FNONE;
-					if (INFO_GTE(NAME, 2) && maybe_ATTRS_REPORT)
+					if (verbose > 1 && maybe_ATTRS_REPORT)
 						rprintf(FCLIENT, "%s is uptodate\n", fname);
 				}
 				break;
 			}
-			/* Content-based basis match only applies to regular
-			 * files: for a hard-linked symlink/device/special the
-			 * exact-inode check above is the only meaningful test,
-			 * and quick_check_ok(FT_REG, ...) would read F_SUM()
-			 * on a file_struct that has no SUM_EXTRA_CNT space
-			 * (recv_file_entry only allocates it for S_ISREG). */
-			if (!S_ISREG(file->mode)
-			 || !quick_check_ok(FT_REG, cmpbuf, file, &alt_sx.st))
+			if (!unchanged_file(cmpbuf, file, &alt_sx.st))
 				continue;
 			statret = 1;
 			if (unchanged_attrs(cmpbuf, file, &alt_sx))
@@ -451,15 +414,23 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 			if (preserve_xattrs) {
 				free_xattr(sxp);
 				if (!XATTR_READY(alt_sx))
-					get_xattr(cmpbuf, -1, sxp);
+					get_xattr(cmpbuf, sxp);
 				else {
 					sxp->xattr = alt_sx.xattr;
 					alt_sx.xattr = NULL;
 				}
 			}
 #endif
-		} else
-			free_stat_x(&alt_sx);
+		} else {
+#ifdef SUPPORT_ACLS
+			if (preserve_acls)
+				free_acl(&alt_sx);
+#endif
+#ifdef SUPPORT_XATTRS
+			if (preserve_xattrs)
+				free_xattr(&alt_sx);
+#endif
+		}
 	}

 	if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
@@ -467,21 +438,18 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		return -1;

 	if (remove_source_files == 1 && do_xfers)
-		send_msg_success(fname, ndx);
+		send_msg_int(MSG_SUCCESS, ndx);

 	return 1;
 }

 int hard_link_one(struct file_struct *file, const char *fname,
-		  const char *oldname, int terse, int vfs_flags)
+		  const char *oldname, int terse)
 {
-	/* oldname is the link source (vfs_flags carries its policy -- VFS_OPERATOR_PATH
-	 * for an alt-dest basis on a non-daemon receiver, else 0); fname is the
-	 * transfer destination, always under the secure receiver resolve. */
-	if (vfs_link_at(oldname, fname, vfs_flags, 0) < 0) {
+	if (do_link(oldname, fname) < 0) {
 		enum logcode code;
 		if (terse) {
-			if (!INFO_GTE(NAME, 1))
+			if (!verbose)
 				return 0;
 			code = FINFO;
 		} else
@@ -508,7 +476,7 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
 	int prev_statret, ndx, prev_ndx = F_HL_PREV(file);

 	if (stp == NULL && prev_ndx >= 0) {
-		if (link_stat(fname, &st, 0) < 0 && !dry_run) {
+		if (link_stat(fname, &st, 0) < 0) {
 			rsyserr(FERROR_XFER, errno, "stat %s failed",
 				full_fname(fname));
 			return;
@@ -526,7 +494,12 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
 	} else
 		our_name = fname;

-	init_stat_x(&prev_sx);
+#ifdef SUPPORT_ACLS
+	prev_sx.acc_acl = prev_sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+	prev_sx.xattr = NULL;
+#endif

 	while ((ndx = prev_ndx) >= 0) {
 		int val;
@@ -539,31 +512,28 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
 		val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
 				      our_name, stp, fname, itemizing, code);
 		flist->in_progress--;
-		free_stat_x(&prev_sx);
+#ifdef SUPPORT_ACLS
+		if (preserve_acls)
+			free_acl(&prev_sx);
+#endif
+#ifdef SUPPORT_XATTRS
+		if (preserve_xattrs)
+			free_xattr(&prev_sx);
+#endif
 		if (val < 0)
 			continue;
 		if (remove_source_files == 1 && do_xfers)
-			send_msg_success(fname, ndx);
+			send_msg_int(MSG_SUCCESS, ndx);
 	}

 	if (inc_recurse) {
 		int gnum = F_HL_GNUM(file);
-		struct ht_int32_node *node = hashtable_find(prior_hlinks, gnum, NULL);
-		if (node == NULL) {
-			rprintf(FERROR, "Unable to find a hlink node for %d (%s)\n", gnum, f_name(file, prev_name));
-			exit_cleanup(RERR_MESSAGEIO);
-		}
-		if (node->data == NULL) {
-			rprintf(FERROR, "Hlink node data for %d is NULL (%s)\n", gnum, f_name(file, prev_name));
-			exit_cleanup(RERR_MESSAGEIO);
-		}
-		if (CVAL(node->data, 0) != 0) {
-			rprintf(FERROR, "Hlink node data for %d already has path=%s (%s)\n",
-				gnum, (char*)node->data, f_name(file, prev_name));
-			exit_cleanup(RERR_MESSAGEIO);
-		}
+		struct ht_int32_node *node = hashtable_find(prior_hlinks, gnum, 0);
+		assert(node != NULL && node->data != NULL);
+		assert(CVAL(node->data, 0) == 0);
 		free(node->data);
-		node->data = strdup(our_name);
+		if (!(node->data = strdup(our_name)))
+			out_of_memory("finish_hard_link");
 	}
 }

@@ -1,6 +1,6 @@
 /* Inline functions for rsync.
 *
- * Copyright (C) 2007-2022 Wayne Davison
+ * Copyright (C) 2007-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,8 @@
 static inline void
 alloc_xbuf(xbuf *xb, size_t sz)
 {
-	xb->buf = new_array(char, sz);
+	if (!(xb->buf = new_array(char, sz)))
+		out_of_memory("alloc_xbuf");
 	xb->size = sz;
 	xb->len = xb->pos = 0;
 }
@@ -28,18 +29,12 @@ static inline void
 realloc_xbuf(xbuf *xb, size_t sz)
 {
 	char *bf = realloc_array(xb->buf, char, sz);
+	if (!bf)
+		out_of_memory("realloc_xbuf");
 	xb->buf = bf;
 	xb->size = sz;
 }

-static inline void
-free_xbuf(xbuf *xb)
-{
-	if (xb->buf)
-		free(xb->buf);
-	memset(xb, 0, sizeof (xbuf));
-}
-
 static inline int
 to_wire_mode(mode_t mode)
 {
@@ -72,41 +67,44 @@ d_name(struct dirent *di)
 #endif
 }

-static inline void
-init_stat_x(stat_x *sx_p)
+static inline int
+isDigit(const char *ptr)
 {
-	sx_p->crtime = 0;
-#ifdef SUPPORT_ACLS
-	sx_p->acc_acl = sx_p->def_acl = NULL;
-#endif
-#ifdef SUPPORT_XATTRS
-	sx_p->xattr = NULL;
-#endif
+	return isdigit(*(unsigned char *)ptr);
 }

-static inline void
-free_stat_x(stat_x *sx_p)
+static inline int
+isPrint(const char *ptr)
 {
-#ifdef SUPPORT_ACLS
-    {
-	extern int preserve_acls;
-	if (preserve_acls)
-		free_acl(sx_p);
-    }
-#endif
-#ifdef SUPPORT_XATTRS
-    {
-	extern int preserve_xattrs;
-	if (preserve_xattrs)
-		free_xattr(sx_p);
-    }
-#endif
+	return isprint(*(unsigned char *)ptr);
 }

-static inline char *my_strdup(const char *str, const char *file, int line)
+static inline int
+isSpace(const char *ptr)
 {
-    int len = strlen(str)+1;
-    char *buf = my_alloc(NULL, len, 1, file, line);
-    memcpy(buf, str, len);
-    return buf;
+	return isspace(*(unsigned char *)ptr);
+}
+
+static inline int
+isLower(const char *ptr)
+{
+	return islower(*(unsigned char *)ptr);
+}
+
+static inline int
+isUpper(const char *ptr)
+{
+	return isupper(*(unsigned char *)ptr);
+}
+
+static inline int
+toLower(const char *ptr)
+{
+	return tolower(*(unsigned char *)ptr);
+}
+
+static inline int
+toUpper(const char *ptr)
+{
+	return toupper(*(unsigned char *)ptr);
 }
@@ -115,7 +115,7 @@ else
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.

-	if [ -f $src ] || [ -d $src ]
+	if [ -f $src -o -d $src ]
 	then
 		true
 	else
@@ -1,57 +0,0 @@
-/* Inline functions for rsync.
- *
- * Copyright (C) 2008-2019 Wayne Davison
- *
- * This program is free software; you can redistribute it and/or modify
- * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, visit the http://fsf.org website.
- */
-
-static inline char *
-big_num(int64 num)
-{
-	return do_big_num(num, 0, NULL);
-}
-
-static inline char *
-comma_num(int64 num)
-{
-	extern int human_readable;
-	return do_big_num(num, human_readable != 0, NULL);
-}
-
-static inline char *
-human_num(int64 num)
-{
-	extern int human_readable;
-	return do_big_num(num, human_readable, NULL);
-}
-
-static inline char *
-big_dnum(double dnum, int decimal_digits)
-{
-	return do_big_dnum(dnum, 0, decimal_digits);
-}
-
-static inline char *
-comma_dnum(double dnum, int decimal_digits)
-{
-	extern int human_readable;
-	return do_big_dnum(dnum, human_readable != 0, decimal_digits);
-}
-
-static inline char *
-human_dnum(double dnum, int decimal_digits)
-{
-	extern int human_readable;
-	return do_big_dnum(dnum, human_readable, decimal_digits);
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2019 Wayne Davison
+ * Copyright (C) 2007-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,71 +0,0 @@
-/* Inline functions for rsync.
- *
- * Copyright (C) 2007-2022 Wayne Davison
- *
- * This program is free software; you can redistribute it and/or modify
- * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, visit the http://fsf.org website.
- */
-
-static inline int
-isDigit(const char *ptr)
-{
-	return isdigit(*(unsigned char *)ptr);
-}
-
-static inline int
-isHexDigit(const char *ptr)
-{
-	return isxdigit(*(unsigned char *)ptr);
-}
-
-static inline int
-isPrint(const char *ptr)
-{
-	return isprint(*(unsigned char *)ptr);
-}
-
-static inline int
-isSpace(const char *ptr)
-{
-	return isspace(*(unsigned char *)ptr);
-}
-
-static inline int
-isAlNum(const char *ptr)
-{
-	return isalnum(*(unsigned char *)ptr);
-}
-
-static inline int
-isLower(const char *ptr)
-{
-	return islower(*(unsigned char *)ptr);
-}
-
-static inline int
-isUpper(const char *ptr)
-{
-	return isupper(*(unsigned char *)ptr);
-}
-
-static inline int
-toLower(const char *ptr)
-{
-	return tolower(*(unsigned char *)ptr);
-}
-
-static inline int
-toUpper(const char *ptr)
-{
-	return toupper(*(unsigned char *)ptr);
-}
@@ -1 +0,0 @@
-#define LATEST_YEAR "2026"
@@ -1,451 +0,0 @@
-/*
- * POSIX ACL get/set/delete via the generic xattr syscalls.
- *
- * POSIX ACLs are stored by the kernel as the "system.posix_acl_access" and
- * "system.posix_acl_default" extended attributes, in a fixed little-endian
- * wire format (see include/acl_ea.h in the acl package).  By serializing that
- * format ourselves and using fgetxattr/fsetxattr on a held O_NOFOLLOW fd -- or
- * getxattrat/setxattrat(AT_SYMLINK_NOFOLLOW) on a dirfd+leaf -- we get a
- * symlink-race-safe ACL primitive that also covers the *default* ACL, which
- * libacl's fd API (acl_get_fd/acl_set_fd, access-only) cannot.
- *
- * This file knows nothing about rsync's globals or its internal ACL form: it
- * speaks a neutral (tag, perm, id) entry array, which makes it directly
- * comparable against the system libacl in the t_acl unit test.
- *
- * Copyright (C) 2026 Wayne Davison & the rsync project
- *
- * This program is free software; you can redistribute it and/or modify
- * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, visit the http://fsf.org website.
- */
-
-#include "rsync.h"
-#include "acl.h"
-
-#ifdef SUPPORT_ACL_FD
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>		/* AT_SYMLINK_NOFOLLOW */
-
-#if defined HAVE_SYS_XATTR_H
-#include <sys/xattr.h>
-#elif defined HAVE_ATTR_XATTR_H
-#include <attr/xattr.h>
-#endif
-
-#ifdef HAVE_XATTRAT_SYSCALLS
-#include <sys/syscall.h>
-/* Self-contained copy of the kernel's struct xattr_args (stable ABI: an
- * 8-byte-aligned u64 pointer, then two u32s).  Defined locally to avoid
- * pulling <linux/xattr.h>, whose XATTR_* macros clash with <sys/xattr.h>. */
-struct rsync_xattr_args {
-	uint64_t value __attribute__((aligned(8)));
-	uint32_t size;
-	uint32_t flags;
-};
-#endif
-
-/* Linux 2.4 didn't have a distinct ENOATTR. */
-#ifndef ENOATTR
-#define ENOATTR ENODATA
-#endif
-
-#define ACL_XATTR_ACCESS  "system.posix_acl_access"
-#define ACL_XATTR_DEFAULT "system.posix_acl_default"
-
-/* On-disk layout: a 4-byte LE version header followed by 8-byte LE entries. */
-#define ACL_EA_VERSION 0x0002
-#define ACL_EA_HDR_LEN 4
-#define ACL_EA_ENT_LEN 8
-
-/* === little-endian (de)serialization (host-endianness independent) === */
-
-static void put_le16(unsigned char *p, uint16_t v)
-{
-	p[0] = (unsigned char)(v & 0xff);
-	p[1] = (unsigned char)((v >> 8) & 0xff);
-}
-
-static void put_le32(unsigned char *p, uint32_t v)
-{
-	p[0] = (unsigned char)(v & 0xff);
-	p[1] = (unsigned char)((v >> 8) & 0xff);
-	p[2] = (unsigned char)((v >> 16) & 0xff);
-	p[3] = (unsigned char)((v >> 24) & 0xff);
-}
-
-static uint16_t get_le16(const unsigned char *p)
-{
-	return (uint16_t)(p[0] | (p[1] << 8));
-}
-
-static uint32_t get_le32(const unsigned char *p)
-{
-	return (uint32_t)p[0] | ((uint32_t)p[1] << 8)
-	     | ((uint32_t)p[2] << 16) | ((uint32_t)p[3] << 24);
-}
-
-static int is_named_tag(uint16_t tag)
-{
-	return tag == RACL_USER || tag == RACL_GROUP;
-}
-
-/* Canonical order: tag ascending, then id ascending within a tag.  This is
- * the order libacl's __acl_reorder_obj_p() produces and what the kernel's
- * validator expects (USER_OBJ, USER*, GROUP_OBJ, GROUP*, MASK, OTHER). */
-static int ent_compare(const void *a, const void *b)
-{
-	const rsync_acl_ent *x = a, *y = b;
-	if (x->tag != y->tag)
-		return x->tag < y->tag ? -1 : 1;
-	if (x->id != y->id)
-		return x->id < y->id ? -1 : 1;
-	return 0;
-}
-
-/* Serialize entries into a freshly-malloc'd xattr buffer (canonical order). */
-static unsigned char *acl_to_xattr(const rsync_acl_ent *ents, int count, size_t *len_out)
-{
-	size_t len = ACL_EA_HDR_LEN + (size_t)count * ACL_EA_ENT_LEN;
-	unsigned char *buf = malloc(len);
-	rsync_acl_ent *sorted = NULL;
-	unsigned char *p;
-	int i;
-
-	if (!buf)
-		return NULL;
-	if (count > 1) {
-		sorted = malloc((size_t)count * sizeof sorted[0]);
-		if (!sorted) {
-			free(buf);
-			return NULL;
-		}
-		memcpy(sorted, ents, (size_t)count * sizeof sorted[0]);
-		qsort(sorted, count, sizeof sorted[0], ent_compare);
-		ents = sorted;
-	}
-
-	put_le32(buf, ACL_EA_VERSION);
-	p = buf + ACL_EA_HDR_LEN;
-	for (i = 0; i < count; i++, p += ACL_EA_ENT_LEN) {
-		put_le16(p, ents[i].tag);
-		put_le16(p + 2, ents[i].perm);
-		put_le32(p + 4, is_named_tag(ents[i].tag) ? ents[i].id : RACL_UNDEFINED_ID);
-	}
-
-	if (sorted)
-		free(sorted);
-	*len_out = len;
-	return buf;
-}
-
-/* Parse an xattr buffer into a malloc'd entry array (canonical order). */
-static int xattr_to_acl(const unsigned char *buf, size_t len,
-			rsync_acl_ent **out, int *count_out)
-{
-	rsync_acl_ent *ents;
-	const unsigned char *p;
-	int n, i;
-
-	if (len < ACL_EA_HDR_LEN || (len - ACL_EA_HDR_LEN) % ACL_EA_ENT_LEN != 0
-	 || get_le32(buf) != ACL_EA_VERSION) {
-		errno = EINVAL;
-		return -1;
-	}
-	n = (int)((len - ACL_EA_HDR_LEN) / ACL_EA_ENT_LEN);
-
-	ents = n ? malloc((size_t)n * sizeof ents[0]) : NULL;
-	if (n && !ents)
-		return -1;
-	p = buf + ACL_EA_HDR_LEN;
-	for (i = 0; i < n; i++, p += ACL_EA_ENT_LEN) {
-		ents[i].tag = get_le16(p);
-		ents[i].perm = get_le16(p + 2);
-		ents[i].id = is_named_tag(ents[i].tag) ? get_le32(p + 4) : RACL_UNDEFINED_ID;
-	}
-	if (n > 1)
-		qsort(ents, n, sizeof ents[0], ent_compare);
-
-	*out = ents;
-	*count_out = n;
-	return 0;
-}
-
-/* === syscall dispatchers (fd-variant vs at-variant) === */
-
-/* Pre-6.13 fallback for the dirfd+leaf at-variants: address the leaf as
- * /proc/self/fd/<dirfd>/<leaf> and use the l*xattr (no-follow-leaf) calls.  The
- * /proc/self/fd/<dirfd> magic symlink resolves to the pinned parent inode -- a
- * raced parent symlink cannot redirect it -- and l*xattr does not follow a raced
- * leaf symlink, so this is race-safe without the Linux 6.13 *xattrat syscalls, as
- * long as procfs is mounted.  (`leaf` is a single component, <= NAME_MAX.)
- * Returns 0 and fills `buf`, or -1 with ENAMETOOLONG. */
-static int proc_fd_leaf_path(char *buf, size_t buflen, int dirfd, const char *leaf)
-{
-	int n = snprintf(buf, buflen, "/proc/self/fd/%d/%s", dirfd, leaf);
-	if (n < 0 || (size_t)n >= buflen) {
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-	return 0;
-}
-
-static ssize_t do_getxattr(int fd, int dirfd, const char *leaf,
-			   const char *name, void *val, size_t size)
-{
-	char p[MAXPATHLEN];
-
-	if (fd >= 0)
-		return fgetxattr(fd, name, val, size);
-#ifdef HAVE_XATTRAT_SYSCALLS
-	{
-		struct rsync_xattr_args args;
-		ssize_t ret;
-		args.value = (uint64_t)(uintptr_t)val;
-		args.size = (uint32_t)size;
-		args.flags = 0;
-		ret = syscall(SYS_getxattrat, dirfd, leaf, AT_SYMLINK_NOFOLLOW,
-			      name, &args, sizeof args);
-		if (ret != -1 || errno != ENOSYS)
-			return ret;
-		/* ENOSYS: kernel < 6.13 -- fall through to the /proc compat. */
-	}
-#endif
-	if (proc_fd_leaf_path(p, sizeof p, dirfd, leaf) < 0)
-		return -1;
-	return lgetxattr(p, name, val, size);
-}
-
-static int do_setxattr(int fd, int dirfd, const char *leaf,
-		       const char *name, const void *val, size_t size)
-{
-	char p[MAXPATHLEN];
-
-	if (fd >= 0)
-		return fsetxattr(fd, name, val, size, 0);
-#ifdef HAVE_XATTRAT_SYSCALLS
-	{
-		struct rsync_xattr_args args;
-		int ret;
-		args.value = (uint64_t)(uintptr_t)val;
-		args.size = (uint32_t)size;
-		args.flags = 0;	/* replace */
-		ret = syscall(SYS_setxattrat, dirfd, leaf, AT_SYMLINK_NOFOLLOW,
-			      name, &args, sizeof args);
-		if (ret != -1 || errno != ENOSYS)
-			return ret;
-	}
-#endif
-	if (proc_fd_leaf_path(p, sizeof p, dirfd, leaf) < 0)
-		return -1;
-	return lsetxattr(p, name, val, size, 0);
-}
-
-static int do_removexattr(int fd, int dirfd, const char *leaf, const char *name)
-{
-	char p[MAXPATHLEN];
-
-	if (fd >= 0)
-		return fremovexattr(fd, name);
-#ifdef HAVE_XATTRAT_SYSCALLS
-	{
-		int ret = syscall(SYS_removexattrat, dirfd, leaf, AT_SYMLINK_NOFOLLOW, name);
-		if (ret != -1 || errno != ENOSYS)
-			return ret;
-	}
-#endif
-	if (proc_fd_leaf_path(p, sizeof p, dirfd, leaf) < 0)
-		return -1;
-	return lremovexattr(p, name);
-}
-
-/* Read the whole named xattr into a malloc'd buffer, growing as needed. */
-static int read_full_xattr(int fd, int dirfd, const char *leaf,
-			   const char *name, unsigned char **buf_out, size_t *len_out)
-{
-	unsigned char *buf = NULL;
-	size_t size = 0;
-	int tries;
-
-	for (tries = 0; tries < 8; tries++) {
-		ssize_t n = do_getxattr(fd, dirfd, leaf, name, size ? buf : NULL, size);
-		if (n >= 0) {
-			if (size == 0) {
-				/* First call just learned the length. */
-				size = n ? (size_t)n : 1;
-				buf = malloc(size);
-				if (!buf)
-					return -1;
-				continue;
-			}
-			*buf_out = buf;
-			*len_out = (size_t)n;
-			return 0;
-		}
-		if (errno == ERANGE) {	/* grew under us: re-probe the size */
-			if (buf)
-				free(buf);
-			buf = NULL;
-			size = 0;
-			continue;
-		}
-		if (buf)
-			free(buf);
-		return -1;	/* ENODATA / EOPNOTSUPP / ENOSYS / ... in errno */
-	}
-	if (buf)
-		free(buf);
-	errno = ERANGE;
-	return -1;
-}
-
-/* === public API === */
-
-static int acl_get_common(int fd, int dirfd, const char *leaf,
-			  int want_default, rsync_acl_ent **entries, int *count)
-{
-	const char *name = want_default ? ACL_XATTR_DEFAULT : ACL_XATTR_ACCESS;
-	unsigned char *buf;
-	size_t len;
-	int rc;
-
-	*entries = NULL;
-	*count = 0;
-
-	if (read_full_xattr(fd, dirfd, leaf, name, &buf, &len) < 0) {
-		if (errno == ENODATA || errno == ENOATTR)
-			return 0;	/* no explicit ACL present */
-		return -1;		/* EOPNOTSUPP / ENOSYS / real error */
-	}
-
-	rc = xattr_to_acl(buf, len, entries, count);
-	free(buf);
-	return rc;
-}
-
-int xacl_get_fd(int fd, int want_default, rsync_acl_ent **entries, int *count)
-{
-	return acl_get_common(fd, -1, NULL, want_default, entries, count);
-}
-
-int xacl_get_at(int dirfd, const char *leaf, int want_default,
-		rsync_acl_ent **entries, int *count)
-{
-	return acl_get_common(-1, dirfd, leaf, want_default, entries, count);
-}
-
-static int acl_set_common(int fd, int dirfd, const char *leaf,
-			  int want_default, const rsync_acl_ent *ents, int count)
-{
-	const char *name = want_default ? ACL_XATTR_DEFAULT : ACL_XATTR_ACCESS;
-	unsigned char *buf;
-	size_t len;
-	int rc, save_errno;
-
-	buf = acl_to_xattr(ents, count, &len);
-	if (!buf) {
-		errno = ENOMEM;
-		return -1;
-	}
-	rc = do_setxattr(fd, dirfd, leaf, name, buf, len);
-	save_errno = errno;
-	free(buf);
-	errno = save_errno;
-	return rc < 0 ? -1 : 0;
-}
-
-int xacl_set_fd(int fd, int want_default, const rsync_acl_ent *ents, int count)
-{
-	return acl_set_common(fd, -1, NULL, want_default, ents, count);
-}
-
-int xacl_set_at(int dirfd, const char *leaf, int want_default,
-		const rsync_acl_ent *ents, int count)
-{
-	return acl_set_common(-1, dirfd, leaf, want_default, ents, count);
-}
-
-static int acl_del_default_common(int fd, int dirfd, const char *leaf)
-{
-	if (do_removexattr(fd, dirfd, leaf, ACL_XATTR_DEFAULT) < 0) {
-		if (errno == ENODATA || errno == ENOATTR)
-			return 0;	/* already absent: success, like acl_delete_def_file */
-		return -1;
-	}
-	return 0;
-}
-
-int xacl_del_default_fd(int fd)
-{
-	return acl_del_default_common(fd, -1, NULL);
-}
-
-int xacl_del_default_at(int dirfd, const char *leaf)
-{
-	return acl_del_default_common(-1, dirfd, leaf);
-}
-
-/* True iff /proc/self/fd magic symlinks are usable, so the dirfd+leaf at-variants
- * work race-safely via the /proc compat on a pre-6.13 kernel. */
-static int proc_self_fd_usable(void)
-{
-	int dfd = open(".", O_RDONLY | O_DIRECTORY | O_CLOEXEC);
-	char p[64];
-	int usable = 0;
-
-	if (dfd < 0)
-		return 0;
-	if (snprintf(p, sizeof p, "/proc/self/fd/%d/.", dfd) < (int)sizeof p) {
-		/* The probe attr is absent; the path resolving (any errno but
-		 * ENOENT/ENOTDIR -- e.g. ENODATA/ENOTSUP/EACCES) means procfs gives us
-		 * the magic fd-symlink we need. */
-		errno = 0;
-		lgetxattr(p, "user.rsync_acl_probe", NULL, 0);
-		usable = !(errno == ENOENT || errno == ENOTDIR);
-	}
-	close(dfd);
-	return usable;
-}
-
-int xacl_at_available(void)
-{
-	static int avail = -1;
-
-	if (avail < 0) {
-#ifdef HAVE_XATTRAT_SYSCALLS
-		/* Probe the *xattrat syscall directly (not via do_getxattr's /proc
-		 * fallback): any errno other than ENOSYS means it is present (6.13+). */
-		struct rsync_xattr_args args;
-		args.value = 0;
-		args.size = 0;
-		args.flags = 0;
-		errno = 0;
-		syscall(SYS_getxattrat, AT_FDCWD, ".", AT_SYMLINK_NOFOLLOW,
-			"user.rsync_acl_probe", &args, sizeof args);
-		if (errno != ENOSYS) {
-			avail = 1;
-			return avail;
-		}
-#endif
-		/* No *xattrat syscalls (pre-6.13, or a kernel built without them): the dirfd+leaf ACL ops
-		 * are still race-safe via /proc/self/fd if procfs is mounted, closing
-		 * the parent-symlink-race gap that otherwise forces the path-based set. */
-		avail = proc_self_fd_usable();
-	}
-	return avail;
-}
-
-#endif /* SUPPORT_ACL_FD */
@@ -1,74 +0,0 @@
-/*
- * POSIX ACL get/set/delete via the generic xattr syscalls, addressing the
- * kernel "system.posix_acl_{access,default}" attributes directly so that the
- * operation can be confined to a held O_NOFOLLOW fd (fsetxattr) or a
- * dirfd+leaf with AT_SYMLINK_NOFOLLOW (setxattrat).  This replaces the path-
- * based libacl acl_*_file() calls on Linux, where those would re-resolve the
- * path and could be redirected by a parent-component symlink race.
- *
- * Copyright (C) 2026 Wayne Davison & the rsync project
- *
- * This program is free software; you can redistribute it and/or modify
- * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, visit the http://fsf.org website.
- */
-
-#ifdef SUPPORT_ACL_FD
-
-#include <stdint.h>
-
-/* A single logical POSIX ACL entry in host-native form.  The tag values are
- * the stable kernel ABI numbers (== the libacl ACL_* constants), so they map
- * straight onto the on-disk e_tag without translation. */
-typedef struct {
-	uint16_t tag;	/* RACL_USER_OBJ / USER / GROUP_OBJ / GROUP / MASK / OTHER */
-	uint16_t perm;	/* permission bits: read=4, write=2, execute=1 */
-	uint32_t id;	/* uid/gid for USER/GROUP entries; RACL_UNDEFINED_ID otherwise */
-} rsync_acl_ent;
-
-#define RACL_USER_OBJ	0x01
-#define RACL_USER	0x02
-#define RACL_GROUP_OBJ	0x04
-#define RACL_GROUP	0x08
-#define RACL_MASK	0x10
-#define RACL_OTHER	0x20
-
-#define RACL_UNDEFINED_ID ((uint32_t)-1)
-
-/* Read the access (want_default==0) or default (want_default!=0) ACL.
- *
- * On success returns 0 and sets *entries to a malloc()ed array of *count
- * entries (the caller frees it with free(); *entries may be NULL when
- * *count==0, which means "no explicit ACL present" -- e.g. ENODATA).
- *
- * On failure returns -1 with errno set.  Callers distinguish:
- *   ENOTSUP/EOPNOTSUPP - this filesystem has no ACL support (may differ per fs)
- *   ENOSYS            - the at-variant syscalls are unavailable on this kernel
- * The fd-variant operates on a held, already-NOFOLLOW-opened descriptor.  The
- * at-variant resolves leaf relative to dirfd and never follows a leaf symlink. */
-int xacl_get_fd(int fd, int want_default, rsync_acl_ent **entries, int *count);
-int xacl_get_at(int dirfd, const char *leaf, int want_default, rsync_acl_ent **entries, int *count);
-
-/* Write the given entries as the access/default ACL.  The entries are emitted
- * in canonical order; the kernel validates them (a malformed set -> EINVAL). */
-int xacl_set_fd(int fd, int want_default, const rsync_acl_ent *entries, int count);
-int xacl_set_at(int dirfd, const char *leaf, int want_default, const rsync_acl_ent *entries, int count);
-
-/* Delete a directory's default ACL.  A missing default ACL is success. */
-int xacl_del_default_fd(int fd);
-int xacl_del_default_at(int dirfd, const char *leaf);
-
-/* Cached runtime probe: are the *xattrat syscalls usable on this kernel?
- * Returns 0 when they are absent (so callers can fall back) or unbuilt. */
-int xacl_at_available(void);
-
-#endif /* SUPPORT_ACL_FD */
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 1998 Andrew Tridgell
 * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004-2020 Wayne Davison
+ * Copyright (C) 2004, 2005, 2006 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,28 +20,17 @@
 */

 #include "rsync.h"
-#include "itypes.h"

-static char number_separator;
-
-char get_number_separator(void)
+#ifndef HAVE_STRDUP
+ char *strdup(char *s)
 {
-	if (!number_separator) {
-		char buf[32];
-		snprintf(buf, sizeof buf, "%f", 3.14);
-		if (strchr(buf, '.') != NULL)
-			number_separator = ',';
-		else
-			number_separator = '.';
-	}
-
-	return number_separator;
-}
-
-char get_decimal_point(void)
-{
-	return get_number_separator() == ',' ? '.' : ',';
+	int len = strlen(s) + 1;
+	char *ret = (char *)malloc(len);
+	if (ret)
+		memcpy(ret, s, len);
+	return ret;
 }
+#endif

 #ifndef HAVE_GETCWD
 char *getcwd(char *buf, int size)
@@ -87,7 +76,7 @@ char get_decimal_point(void)

 #ifndef HAVE_STRPBRK
 /**
- * Find the first occurrence in @p s of any character in @p accept.
+ * Find the first ocurrence in @p s of any character in @p accept.
 *
 * Derived from glibc
 **/
@@ -162,111 +151,3 @@ int sys_gettimeofday(struct timeval *tv)
 	return gettimeofday(tv);
 #endif
 }
-
-/* Return the int64 number as a string.  If the human_flag arg is non-zero,
- * we may output the number in K, M, G, or T units.  If we don't add a unit
- * suffix, we will append the fract string, if it is non-NULL.  We can
- * return up to 4 buffers at a time. */
-char *do_big_num(int64 num, int human_flag, const char *fract)
-{
-	static char bufs[4][128]; /* more than enough room */
-	static unsigned int n;
-	char *s;
-	int len, negated;
-
-	if (human_flag && !number_separator)
-		(void)get_number_separator();
-
-	n = (n + 1) % (sizeof bufs / sizeof bufs[0]);
-
-	if (human_flag > 1) {
-		int mult = human_flag == 2 ? 1000 : 1024;
-		if (num >= mult || num <= -mult) {
-			double dnum = (double)num / mult;
-			char units;
-			if (num < 0)
-				dnum = -dnum;
-			if (dnum < mult)
-				units = 'K';
-			else if ((dnum /= mult) < mult)
-				units = 'M';
-			else if ((dnum /= mult) < mult)
-				units = 'G';
-			else if ((dnum /= mult) < mult)
-				units = 'T';
-			else {
-				dnum /= mult;
-				units = 'P';
-			}
-			if (num < 0)
-				dnum = -dnum;
-			snprintf(bufs[n], sizeof bufs[0], "%.2f%c", dnum, units);
-			return bufs[n];
-		}
-	}
-
-	s = bufs[n] + sizeof bufs[0] - 1;
-	if (fract) {
-		len = strlen(fract);
-		s -= len;
-		strlcpy(s, fract, len + 1);
-	} else
-		*s = '\0';
-
-	len = 0;
-
-	if (!num)
-		*--s = '0';
-	if (num < 0) {
-		/* A maximum-size negated number can't fit as a positive,
-		 * so do one digit in negated form to start us off. */
-		*--s = (char)(-(num % 10)) + '0';
-		num = -(num / 10);
-		len++;
-		negated = 1;
-	} else
-		negated = 0;
-
-	while (num) {
-		if (human_flag) {
-			if (len == 3) {
-				*--s = number_separator;
-				len = 1;
-			} else
-				len++;
-		}
-		*--s = (char)(num % 10) + '0';
-		num /= 10;
-	}
-
-	if (negated)
-		*--s = '-';
-
-	return s;
-}
-
-/* Return the double number as a string.  If the human_flag option is > 1,
- * we may output the number in K, M, G, or T units.  The buffer we use for
- * our result is either a single static buffer defined here, or a buffer
- * we get from do_big_num(). */
-char *do_big_dnum(double dnum, int human_flag, int decimal_digits)
-{
-	static char tmp_buf[128];
-#if SIZEOF_INT64 >= 8
-	char *fract;
-
-	snprintf(tmp_buf, sizeof tmp_buf, "%.*f", decimal_digits, dnum);
-
-	if (!human_flag || (dnum < 1000.0 && dnum > -1000.0))
-		return tmp_buf;
-
-	for (fract = tmp_buf+1; isDigit(fract); fract++) {}
-
-	return do_big_num((int64)dnum, human_flag, fract);
-#else
-	/* A big number might lose digits converting to a too-short int64,
-	 * so let's just return the raw double conversion. */
-	snprintf(tmp_buf, sizeof tmp_buf, "%.*f", decimal_digits, dnum);
-	return tmp_buf;
-#endif
-}
@@ -295,8 +295,9 @@ int getaddrinfo(const char *node,
 					res);
 		} else if (hints.ai_flags & AI_NUMERICHOST) {
 			struct in_addr ip;
-			if (inet_pton(AF_INET, node, &ip) <= 0)
+			if (!inet_aton(node, &ip)) {
 				return EAI_FAIL;
+			}
 			return getaddr_info_single_addr(service,
 					ntohl(ip.s_addr),
 					&hints,
@@ -1,72 +0,0 @@
-/*
- * An implementation of getpass for systems that lack one.
- *
- * Copyright (C) 2013 Roman Donchenko
- *
- * This program is free software; you can redistribute it and/or modify
- * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, visit the http://fsf.org website.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <termios.h>
-
-#include "rsync.h"
-
-char *getpass(const char *prompt)
-{
-	static char password[256];
-
-	BOOL tty_changed = False, read_success;
-	struct termios tty_old, tty_new;
-	FILE *in = stdin, *out = stderr;
-	FILE *tty = fopen("/dev/tty", "w+");
-
-	if (tty)
-		in = out = tty;
-
-	if (tcgetattr(fileno(in), &tty_old) == 0) {
-		tty_new = tty_old;
-		tty_new.c_lflag &= ~(ECHO | ISIG);
-
-		if (tcsetattr(fileno(in), TCSAFLUSH, &tty_new) == 0)
-			tty_changed = True;
-	}
-
-	if (!tty_changed)
-		fputs("(WARNING: will be visible) ", out);
-	fputs(prompt, out);
-	fflush(out);
-
-	read_success = fgets(password, sizeof password, in) != NULL;
-
-	/* Print the newline that hasn't been echoed. */
-	fputc('\n', out);
-
-	if (tty_changed)
-		tcsetattr(fileno(in), TCSAFLUSH, &tty_old);
-
-	if (tty)
-		fclose(tty);
-
-	if (read_success) {
-		/* Remove the trailing newline. */
-		size_t password_len = strlen(password);
-		if (password_len && password[password_len - 1] == '\n')
-			password[password_len - 1] = '\0';
-
-		return password;
-	}
-
-	return NULL;
-}
@@ -1,37 +0,0 @@
-/* Keep this simple so both C and ASM can use it */
-
-/* These allow something like CFLAGS=-DDISABLE_SHA512_DIGEST */
-#ifdef DISABLE_SHA256_DIGEST
-#undef SHA256_DIGEST_LENGTH
-#endif
-#ifdef DISABLE_SHA512_DIGEST
-#undef SHA512_DIGEST_LENGTH
-#endif
-
-#define MD4_DIGEST_LEN 16
-#define MD5_DIGEST_LEN 16
-#if defined SHA512_DIGEST_LENGTH
-#define MAX_DIGEST_LEN SHA512_DIGEST_LENGTH
-#elif defined SHA256_DIGEST_LENGTH
-#define MAX_DIGEST_LEN SHA256_DIGEST_LENGTH
-#elif defined SHA_DIGEST_LENGTH
-#define MAX_DIGEST_LEN SHA_DIGEST_LENGTH
-#else
-#define MAX_DIGEST_LEN MD5_DIGEST_LEN
-#endif
-
-#define CSUM_CHUNK 64
-
-#define CSUM_gone -1
-#define CSUM_NONE 0
-#define CSUM_MD4_ARCHAIC 1
-#define CSUM_MD4_BUSTED 2
-#define CSUM_MD4_OLD 3
-#define CSUM_MD4 4
-#define CSUM_MD5 5
-#define CSUM_XXH64 6
-#define CSUM_XXH3_64 7
-#define CSUM_XXH3_128 8
-#define CSUM_SHA1 9
-#define CSUM_SHA256 10
-#define CSUM_SHA512 11
@@ -1,703 +0,0 @@
-/*
- * x86-64 optimized assembler MD5 implementation
- *
- * Author: Marc Bevand, 2004
- *
- * This code was placed in the public domain by the author. The original
- * publication can be found at:
- *
- * https://www.zorinaq.com/papers/md5-amd64.html
- */
-/*
- * No modifications were made aside from changing the function and file names.
- * The MD5_CTX structure as expected here (from OpenSSL) is binary compatible
- * with the md_context used by rsync, for the fields accessed.
- *
- * Benchmarks (in MB/s)            C     ASM
- * - Intel Atom D2700            302     334
- * - Intel i7-7700hq             351     376
- * - AMD ThreadRipper 2950x      728     784
- *
- * The original code was also incorporated into OpenSSL. It has since been
- * modified there. Those changes have not been made here due to licensing
- * incompatibilities. Benchmarks of those changes on the above CPUs did not
- * show any significant difference in performance, though.
- */
-
-#include "config.h"
-#include "md-defines.h"
-
-#ifdef USE_MD5_ASM /* { */
-
-#ifdef __APPLE__
-#define md5_process_asm _md5_process_asm
-#endif
-
-.text
-/* .balign = N bytes everywhere; bare .align means 2^N on Mach-O (would ask
- * for 64KB alignment and trip a macOS linker warning). */
-.balign 16
-
-.globl md5_process_asm
-md5_process_asm:
-	push	%rbp
-	push	%rbx
-	push	%r12
-	push	%r13			# not really useful (r13 is unused)
-	push	%r14
-	push	%r15
-
-	# rdi = arg #1 (ctx, MD5_CTX pointer)
-	# rsi = arg #2 (ptr, data pointer)
-	# rdx = arg #3 (nbr, number of 16-word blocks to process)
-	mov	%rdi,		%rbp	# rbp = ctx
-	shl	$6,		%rdx	# rdx = nbr in bytes
-	lea	(%rsi,%rdx),	%rdi	# rdi = end
-	mov	0*4(%rbp),	%eax	# eax = ctx->A
-	mov	1*4(%rbp),	%ebx	# ebx = ctx->B
-	mov	2*4(%rbp),	%ecx	# ecx = ctx->C
-	mov	3*4(%rbp),	%edx	# edx = ctx->D
-	# end is 'rdi'
-	# ptr is 'rsi'
-	# A is 'eax'
-	# B is 'ebx'
-	# C is 'ecx'
-	# D is 'edx'
-
-	cmp	%rdi,		%rsi		# cmp end with ptr
-	je	1f				# jmp if ptr == end
-
-	# BEGIN of loop over 16-word blocks
-2:	# save old values of A, B, C, D
-	mov	%eax,		%r8d
-	mov	%ebx,		%r9d
-	mov	%ecx,		%r14d
-	mov	%edx,		%r15d
- mov	0*4(%rsi),	%r10d		/* (NEXT STEP) X[0] */
- mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	xor	%ecx,		%r11d		/* y ^ ... */
-	lea	-680876936(%eax,%r10d),%eax		/* Const + dst + ... */
-	and	%ebx,		%r11d		/* x & ... */
-	xor	%edx,		%r11d		/* z ^ ... */
-	mov	1*4(%rsi),%r10d		/* (NEXT STEP) X[1] */
-	add	%r11d,		%eax		/* dst += ... */
-	rol	$7,		%eax		/* dst <<< s */
-	mov	%ecx,		%r11d		/* (NEXT STEP) z' = %ecx */
-	add	%ebx,		%eax		/* dst += x */
-	xor	%ebx,		%r11d		/* y ^ ... */
-	lea	-389564586(%edx,%r10d),%edx		/* Const + dst + ... */
-	and	%eax,		%r11d		/* x & ... */
-	xor	%ecx,		%r11d		/* z ^ ... */
-	mov	2*4(%rsi),%r10d		/* (NEXT STEP) X[2] */
-	add	%r11d,		%edx		/* dst += ... */
-	rol	$12,		%edx		/* dst <<< s */
-	mov	%ebx,		%r11d		/* (NEXT STEP) z' = %ebx */
-	add	%eax,		%edx		/* dst += x */
-	xor	%eax,		%r11d		/* y ^ ... */
-	lea	606105819(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	and	%edx,		%r11d		/* x & ... */
-	xor	%ebx,		%r11d		/* z ^ ... */
-	mov	3*4(%rsi),%r10d		/* (NEXT STEP) X[3] */
-	add	%r11d,		%ecx		/* dst += ... */
-	rol	$17,		%ecx		/* dst <<< s */
-	mov	%eax,		%r11d		/* (NEXT STEP) z' = %eax */
-	add	%edx,		%ecx		/* dst += x */
-	xor	%edx,		%r11d		/* y ^ ... */
-	lea	-1044525330(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	and	%ecx,		%r11d		/* x & ... */
-	xor	%eax,		%r11d		/* z ^ ... */
-	mov	4*4(%rsi),%r10d		/* (NEXT STEP) X[4] */
-	add	%r11d,		%ebx		/* dst += ... */
-	rol	$22,		%ebx		/* dst <<< s */
-	mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	add	%ecx,		%ebx		/* dst += x */
-	xor	%ecx,		%r11d		/* y ^ ... */
-	lea	-176418897(%eax,%r10d),%eax		/* Const + dst + ... */
-	and	%ebx,		%r11d		/* x & ... */
-	xor	%edx,		%r11d		/* z ^ ... */
-	mov	5*4(%rsi),%r10d		/* (NEXT STEP) X[5] */
-	add	%r11d,		%eax		/* dst += ... */
-	rol	$7,		%eax		/* dst <<< s */
-	mov	%ecx,		%r11d		/* (NEXT STEP) z' = %ecx */
-	add	%ebx,		%eax		/* dst += x */
-	xor	%ebx,		%r11d		/* y ^ ... */
-	lea	1200080426(%edx,%r10d),%edx		/* Const + dst + ... */
-	and	%eax,		%r11d		/* x & ... */
-	xor	%ecx,		%r11d		/* z ^ ... */
-	mov	6*4(%rsi),%r10d		/* (NEXT STEP) X[6] */
-	add	%r11d,		%edx		/* dst += ... */
-	rol	$12,		%edx		/* dst <<< s */
-	mov	%ebx,		%r11d		/* (NEXT STEP) z' = %ebx */
-	add	%eax,		%edx		/* dst += x */
-	xor	%eax,		%r11d		/* y ^ ... */
-	lea	-1473231341(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	and	%edx,		%r11d		/* x & ... */
-	xor	%ebx,		%r11d		/* z ^ ... */
-	mov	7*4(%rsi),%r10d		/* (NEXT STEP) X[7] */
-	add	%r11d,		%ecx		/* dst += ... */
-	rol	$17,		%ecx		/* dst <<< s */
-	mov	%eax,		%r11d		/* (NEXT STEP) z' = %eax */
-	add	%edx,		%ecx		/* dst += x */
-	xor	%edx,		%r11d		/* y ^ ... */
-	lea	-45705983(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	and	%ecx,		%r11d		/* x & ... */
-	xor	%eax,		%r11d		/* z ^ ... */
-	mov	8*4(%rsi),%r10d		/* (NEXT STEP) X[8] */
-	add	%r11d,		%ebx		/* dst += ... */
-	rol	$22,		%ebx		/* dst <<< s */
-	mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	add	%ecx,		%ebx		/* dst += x */
-	xor	%ecx,		%r11d		/* y ^ ... */
-	lea	1770035416(%eax,%r10d),%eax		/* Const + dst + ... */
-	and	%ebx,		%r11d		/* x & ... */
-	xor	%edx,		%r11d		/* z ^ ... */
-	mov	9*4(%rsi),%r10d		/* (NEXT STEP) X[9] */
-	add	%r11d,		%eax		/* dst += ... */
-	rol	$7,		%eax		/* dst <<< s */
-	mov	%ecx,		%r11d		/* (NEXT STEP) z' = %ecx */
-	add	%ebx,		%eax		/* dst += x */
-	xor	%ebx,		%r11d		/* y ^ ... */
-	lea	-1958414417(%edx,%r10d),%edx		/* Const + dst + ... */
-	and	%eax,		%r11d		/* x & ... */
-	xor	%ecx,		%r11d		/* z ^ ... */
-	mov	10*4(%rsi),%r10d		/* (NEXT STEP) X[10] */
-	add	%r11d,		%edx		/* dst += ... */
-	rol	$12,		%edx		/* dst <<< s */
-	mov	%ebx,		%r11d		/* (NEXT STEP) z' = %ebx */
-	add	%eax,		%edx		/* dst += x */
-	xor	%eax,		%r11d		/* y ^ ... */
-	lea	-42063(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	and	%edx,		%r11d		/* x & ... */
-	xor	%ebx,		%r11d		/* z ^ ... */
-	mov	11*4(%rsi),%r10d		/* (NEXT STEP) X[11] */
-	add	%r11d,		%ecx		/* dst += ... */
-	rol	$17,		%ecx		/* dst <<< s */
-	mov	%eax,		%r11d		/* (NEXT STEP) z' = %eax */
-	add	%edx,		%ecx		/* dst += x */
-	xor	%edx,		%r11d		/* y ^ ... */
-	lea	-1990404162(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	and	%ecx,		%r11d		/* x & ... */
-	xor	%eax,		%r11d		/* z ^ ... */
-	mov	12*4(%rsi),%r10d		/* (NEXT STEP) X[12] */
-	add	%r11d,		%ebx		/* dst += ... */
-	rol	$22,		%ebx		/* dst <<< s */
-	mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	add	%ecx,		%ebx		/* dst += x */
-	xor	%ecx,		%r11d		/* y ^ ... */
-	lea	1804603682(%eax,%r10d),%eax		/* Const + dst + ... */
-	and	%ebx,		%r11d		/* x & ... */
-	xor	%edx,		%r11d		/* z ^ ... */
-	mov	13*4(%rsi),%r10d		/* (NEXT STEP) X[13] */
-	add	%r11d,		%eax		/* dst += ... */
-	rol	$7,		%eax		/* dst <<< s */
-	mov	%ecx,		%r11d		/* (NEXT STEP) z' = %ecx */
-	add	%ebx,		%eax		/* dst += x */
-	xor	%ebx,		%r11d		/* y ^ ... */
-	lea	-40341101(%edx,%r10d),%edx		/* Const + dst + ... */
-	and	%eax,		%r11d		/* x & ... */
-	xor	%ecx,		%r11d		/* z ^ ... */
-	mov	14*4(%rsi),%r10d		/* (NEXT STEP) X[14] */
-	add	%r11d,		%edx		/* dst += ... */
-	rol	$12,		%edx		/* dst <<< s */
-	mov	%ebx,		%r11d		/* (NEXT STEP) z' = %ebx */
-	add	%eax,		%edx		/* dst += x */
-	xor	%eax,		%r11d		/* y ^ ... */
-	lea	-1502002290(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	and	%edx,		%r11d		/* x & ... */
-	xor	%ebx,		%r11d		/* z ^ ... */
-	mov	15*4(%rsi),%r10d		/* (NEXT STEP) X[15] */
-	add	%r11d,		%ecx		/* dst += ... */
-	rol	$17,		%ecx		/* dst <<< s */
-	mov	%eax,		%r11d		/* (NEXT STEP) z' = %eax */
-	add	%edx,		%ecx		/* dst += x */
-	xor	%edx,		%r11d		/* y ^ ... */
-	lea	1236535329(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	and	%ecx,		%r11d		/* x & ... */
-	xor	%eax,		%r11d		/* z ^ ... */
-	mov	0*4(%rsi),%r10d		/* (NEXT STEP) X[0] */
-	add	%r11d,		%ebx		/* dst += ... */
-	rol	$22,		%ebx		/* dst <<< s */
-	mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	add	%ecx,		%ebx		/* dst += x */
- mov	1*4(%rsi),	%r10d		/* (NEXT STEP) X[1] */
- mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
- mov	%edx,		%r12d		/* (NEXT STEP) z' = %edx */
-	not	%r11d				/* not z */
-	lea	-165796510(%eax,%r10d),%eax		/* Const + dst + ... */
-	and	%ebx,		%r12d		/* x & z */
-	and	%ecx,		%r11d		/* y & (not z) */
-	mov	6*4(%rsi),%r10d		/* (NEXT STEP) X[6] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%ecx,		%r11d		/* (NEXT STEP) z' = %ecx */
-	add	%r12d,		%eax		/* dst += ... */
-	mov	%ecx,		%r12d		/* (NEXT STEP) z' = %ecx */
-	rol	$5,		%eax		/* dst <<< s */
-	add	%ebx,		%eax		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-1069501632(%edx,%r10d),%edx		/* Const + dst + ... */
-	and	%eax,		%r12d		/* x & z */
-	and	%ebx,		%r11d		/* y & (not z) */
-	mov	11*4(%rsi),%r10d		/* (NEXT STEP) X[11] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%ebx,		%r11d		/* (NEXT STEP) z' = %ebx */
-	add	%r12d,		%edx		/* dst += ... */
-	mov	%ebx,		%r12d		/* (NEXT STEP) z' = %ebx */
-	rol	$9,		%edx		/* dst <<< s */
-	add	%eax,		%edx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	643717713(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	and	%edx,		%r12d		/* x & z */
-	and	%eax,		%r11d		/* y & (not z) */
-	mov	0*4(%rsi),%r10d		/* (NEXT STEP) X[0] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%eax,		%r11d		/* (NEXT STEP) z' = %eax */
-	add	%r12d,		%ecx		/* dst += ... */
-	mov	%eax,		%r12d		/* (NEXT STEP) z' = %eax */
-	rol	$14,		%ecx		/* dst <<< s */
-	add	%edx,		%ecx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-373897302(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	and	%ecx,		%r12d		/* x & z */
-	and	%edx,		%r11d		/* y & (not z) */
-	mov	5*4(%rsi),%r10d		/* (NEXT STEP) X[5] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	add	%r12d,		%ebx		/* dst += ... */
-	mov	%edx,		%r12d		/* (NEXT STEP) z' = %edx */
-	rol	$20,		%ebx		/* dst <<< s */
-	add	%ecx,		%ebx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-701558691(%eax,%r10d),%eax		/* Const + dst + ... */
-	and	%ebx,		%r12d		/* x & z */
-	and	%ecx,		%r11d		/* y & (not z) */
-	mov	10*4(%rsi),%r10d		/* (NEXT STEP) X[10] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%ecx,		%r11d		/* (NEXT STEP) z' = %ecx */
-	add	%r12d,		%eax		/* dst += ... */
-	mov	%ecx,		%r12d		/* (NEXT STEP) z' = %ecx */
-	rol	$5,		%eax		/* dst <<< s */
-	add	%ebx,		%eax		/* dst += x */
-	not	%r11d				/* not z */
-	lea	38016083(%edx,%r10d),%edx		/* Const + dst + ... */
-	and	%eax,		%r12d		/* x & z */
-	and	%ebx,		%r11d		/* y & (not z) */
-	mov	15*4(%rsi),%r10d		/* (NEXT STEP) X[15] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%ebx,		%r11d		/* (NEXT STEP) z' = %ebx */
-	add	%r12d,		%edx		/* dst += ... */
-	mov	%ebx,		%r12d		/* (NEXT STEP) z' = %ebx */
-	rol	$9,		%edx		/* dst <<< s */
-	add	%eax,		%edx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-660478335(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	and	%edx,		%r12d		/* x & z */
-	and	%eax,		%r11d		/* y & (not z) */
-	mov	4*4(%rsi),%r10d		/* (NEXT STEP) X[4] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%eax,		%r11d		/* (NEXT STEP) z' = %eax */
-	add	%r12d,		%ecx		/* dst += ... */
-	mov	%eax,		%r12d		/* (NEXT STEP) z' = %eax */
-	rol	$14,		%ecx		/* dst <<< s */
-	add	%edx,		%ecx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-405537848(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	and	%ecx,		%r12d		/* x & z */
-	and	%edx,		%r11d		/* y & (not z) */
-	mov	9*4(%rsi),%r10d		/* (NEXT STEP) X[9] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	add	%r12d,		%ebx		/* dst += ... */
-	mov	%edx,		%r12d		/* (NEXT STEP) z' = %edx */
-	rol	$20,		%ebx		/* dst <<< s */
-	add	%ecx,		%ebx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	568446438(%eax,%r10d),%eax		/* Const + dst + ... */
-	and	%ebx,		%r12d		/* x & z */
-	and	%ecx,		%r11d		/* y & (not z) */
-	mov	14*4(%rsi),%r10d		/* (NEXT STEP) X[14] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%ecx,		%r11d		/* (NEXT STEP) z' = %ecx */
-	add	%r12d,		%eax		/* dst += ... */
-	mov	%ecx,		%r12d		/* (NEXT STEP) z' = %ecx */
-	rol	$5,		%eax		/* dst <<< s */
-	add	%ebx,		%eax		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-1019803690(%edx,%r10d),%edx		/* Const + dst + ... */
-	and	%eax,		%r12d		/* x & z */
-	and	%ebx,		%r11d		/* y & (not z) */
-	mov	3*4(%rsi),%r10d		/* (NEXT STEP) X[3] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%ebx,		%r11d		/* (NEXT STEP) z' = %ebx */
-	add	%r12d,		%edx		/* dst += ... */
-	mov	%ebx,		%r12d		/* (NEXT STEP) z' = %ebx */
-	rol	$9,		%edx		/* dst <<< s */
-	add	%eax,		%edx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-187363961(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	and	%edx,		%r12d		/* x & z */
-	and	%eax,		%r11d		/* y & (not z) */
-	mov	8*4(%rsi),%r10d		/* (NEXT STEP) X[8] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%eax,		%r11d		/* (NEXT STEP) z' = %eax */
-	add	%r12d,		%ecx		/* dst += ... */
-	mov	%eax,		%r12d		/* (NEXT STEP) z' = %eax */
-	rol	$14,		%ecx		/* dst <<< s */
-	add	%edx,		%ecx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	1163531501(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	and	%ecx,		%r12d		/* x & z */
-	and	%edx,		%r11d		/* y & (not z) */
-	mov	13*4(%rsi),%r10d		/* (NEXT STEP) X[13] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	add	%r12d,		%ebx		/* dst += ... */
-	mov	%edx,		%r12d		/* (NEXT STEP) z' = %edx */
-	rol	$20,		%ebx		/* dst <<< s */
-	add	%ecx,		%ebx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-1444681467(%eax,%r10d),%eax		/* Const + dst + ... */
-	and	%ebx,		%r12d		/* x & z */
-	and	%ecx,		%r11d		/* y & (not z) */
-	mov	2*4(%rsi),%r10d		/* (NEXT STEP) X[2] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%ecx,		%r11d		/* (NEXT STEP) z' = %ecx */
-	add	%r12d,		%eax		/* dst += ... */
-	mov	%ecx,		%r12d		/* (NEXT STEP) z' = %ecx */
-	rol	$5,		%eax		/* dst <<< s */
-	add	%ebx,		%eax		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-51403784(%edx,%r10d),%edx		/* Const + dst + ... */
-	and	%eax,		%r12d		/* x & z */
-	and	%ebx,		%r11d		/* y & (not z) */
-	mov	7*4(%rsi),%r10d		/* (NEXT STEP) X[7] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%ebx,		%r11d		/* (NEXT STEP) z' = %ebx */
-	add	%r12d,		%edx		/* dst += ... */
-	mov	%ebx,		%r12d		/* (NEXT STEP) z' = %ebx */
-	rol	$9,		%edx		/* dst <<< s */
-	add	%eax,		%edx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	1735328473(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	and	%edx,		%r12d		/* x & z */
-	and	%eax,		%r11d		/* y & (not z) */
-	mov	12*4(%rsi),%r10d		/* (NEXT STEP) X[12] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%eax,		%r11d		/* (NEXT STEP) z' = %eax */
-	add	%r12d,		%ecx		/* dst += ... */
-	mov	%eax,		%r12d		/* (NEXT STEP) z' = %eax */
-	rol	$14,		%ecx		/* dst <<< s */
-	add	%edx,		%ecx		/* dst += x */
-	not	%r11d				/* not z */
-	lea	-1926607734(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	and	%ecx,		%r12d		/* x & z */
-	and	%edx,		%r11d		/* y & (not z) */
-	mov	0*4(%rsi),%r10d		/* (NEXT STEP) X[0] */
-	or	%r11d,		%r12d		/* (y & (not z)) | (x & z) */
-	mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */
-	add	%r12d,		%ebx		/* dst += ... */
-	mov	%edx,		%r12d		/* (NEXT STEP) z' = %edx */
-	rol	$20,		%ebx		/* dst <<< s */
-	add	%ecx,		%ebx		/* dst += x */
- mov	5*4(%rsi),	%r10d		/* (NEXT STEP) X[5] */
- mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */
-	lea	-378558(%eax,%r10d),%eax		/* Const + dst + ... */
-	mov	8*4(%rsi),%r10d		/* (NEXT STEP) X[8] */
-	xor	%edx,		%r11d		/* z ^ ... */
-	xor	%ebx,		%r11d		/* x ^ ... */
-	add	%r11d,		%eax		/* dst += ... */
-	rol	$4,		%eax		/* dst <<< s */
-	mov	%ebx,		%r11d		/* (NEXT STEP) y' = %ebx */
-	add	%ebx,		%eax		/* dst += x */
-	lea	-2022574463(%edx,%r10d),%edx		/* Const + dst + ... */
-	mov	11*4(%rsi),%r10d		/* (NEXT STEP) X[11] */
-	xor	%ecx,		%r11d		/* z ^ ... */
-	xor	%eax,		%r11d		/* x ^ ... */
-	add	%r11d,		%edx		/* dst += ... */
-	rol	$11,		%edx		/* dst <<< s */
-	mov	%eax,		%r11d		/* (NEXT STEP) y' = %eax */
-	add	%eax,		%edx		/* dst += x */
-	lea	1839030562(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	mov	14*4(%rsi),%r10d		/* (NEXT STEP) X[14] */
-	xor	%ebx,		%r11d		/* z ^ ... */
-	xor	%edx,		%r11d		/* x ^ ... */
-	add	%r11d,		%ecx		/* dst += ... */
-	rol	$16,		%ecx		/* dst <<< s */
-	mov	%edx,		%r11d		/* (NEXT STEP) y' = %edx */
-	add	%edx,		%ecx		/* dst += x */
-	lea	-35309556(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	mov	1*4(%rsi),%r10d		/* (NEXT STEP) X[1] */
-	xor	%eax,		%r11d		/* z ^ ... */
-	xor	%ecx,		%r11d		/* x ^ ... */
-	add	%r11d,		%ebx		/* dst += ... */
-	rol	$23,		%ebx		/* dst <<< s */
-	mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */
-	add	%ecx,		%ebx		/* dst += x */
-	lea	-1530992060(%eax,%r10d),%eax		/* Const + dst + ... */
-	mov	4*4(%rsi),%r10d		/* (NEXT STEP) X[4] */
-	xor	%edx,		%r11d		/* z ^ ... */
-	xor	%ebx,		%r11d		/* x ^ ... */
-	add	%r11d,		%eax		/* dst += ... */
-	rol	$4,		%eax		/* dst <<< s */
-	mov	%ebx,		%r11d		/* (NEXT STEP) y' = %ebx */
-	add	%ebx,		%eax		/* dst += x */
-	lea	1272893353(%edx,%r10d),%edx		/* Const + dst + ... */
-	mov	7*4(%rsi),%r10d		/* (NEXT STEP) X[7] */
-	xor	%ecx,		%r11d		/* z ^ ... */
-	xor	%eax,		%r11d		/* x ^ ... */
-	add	%r11d,		%edx		/* dst += ... */
-	rol	$11,		%edx		/* dst <<< s */
-	mov	%eax,		%r11d		/* (NEXT STEP) y' = %eax */
-	add	%eax,		%edx		/* dst += x */
-	lea	-155497632(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	mov	10*4(%rsi),%r10d		/* (NEXT STEP) X[10] */
-	xor	%ebx,		%r11d		/* z ^ ... */
-	xor	%edx,		%r11d		/* x ^ ... */
-	add	%r11d,		%ecx		/* dst += ... */
-	rol	$16,		%ecx		/* dst <<< s */
-	mov	%edx,		%r11d		/* (NEXT STEP) y' = %edx */
-	add	%edx,		%ecx		/* dst += x */
-	lea	-1094730640(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	mov	13*4(%rsi),%r10d		/* (NEXT STEP) X[13] */
-	xor	%eax,		%r11d		/* z ^ ... */
-	xor	%ecx,		%r11d		/* x ^ ... */
-	add	%r11d,		%ebx		/* dst += ... */
-	rol	$23,		%ebx		/* dst <<< s */
-	mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */
-	add	%ecx,		%ebx		/* dst += x */
-	lea	681279174(%eax,%r10d),%eax		/* Const + dst + ... */
-	mov	0*4(%rsi),%r10d		/* (NEXT STEP) X[0] */
-	xor	%edx,		%r11d		/* z ^ ... */
-	xor	%ebx,		%r11d		/* x ^ ... */
-	add	%r11d,		%eax		/* dst += ... */
-	rol	$4,		%eax		/* dst <<< s */
-	mov	%ebx,		%r11d		/* (NEXT STEP) y' = %ebx */
-	add	%ebx,		%eax		/* dst += x */
-	lea	-358537222(%edx,%r10d),%edx		/* Const + dst + ... */
-	mov	3*4(%rsi),%r10d		/* (NEXT STEP) X[3] */
-	xor	%ecx,		%r11d		/* z ^ ... */
-	xor	%eax,		%r11d		/* x ^ ... */
-	add	%r11d,		%edx		/* dst += ... */
-	rol	$11,		%edx		/* dst <<< s */
-	mov	%eax,		%r11d		/* (NEXT STEP) y' = %eax */
-	add	%eax,		%edx		/* dst += x */
-	lea	-722521979(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	mov	6*4(%rsi),%r10d		/* (NEXT STEP) X[6] */
-	xor	%ebx,		%r11d		/* z ^ ... */
-	xor	%edx,		%r11d		/* x ^ ... */
-	add	%r11d,		%ecx		/* dst += ... */
-	rol	$16,		%ecx		/* dst <<< s */
-	mov	%edx,		%r11d		/* (NEXT STEP) y' = %edx */
-	add	%edx,		%ecx		/* dst += x */
-	lea	76029189(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	mov	9*4(%rsi),%r10d		/* (NEXT STEP) X[9] */
-	xor	%eax,		%r11d		/* z ^ ... */
-	xor	%ecx,		%r11d		/* x ^ ... */
-	add	%r11d,		%ebx		/* dst += ... */
-	rol	$23,		%ebx		/* dst <<< s */
-	mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */
-	add	%ecx,		%ebx		/* dst += x */
-	lea	-640364487(%eax,%r10d),%eax		/* Const + dst + ... */
-	mov	12*4(%rsi),%r10d		/* (NEXT STEP) X[12] */
-	xor	%edx,		%r11d		/* z ^ ... */
-	xor	%ebx,		%r11d		/* x ^ ... */
-	add	%r11d,		%eax		/* dst += ... */
-	rol	$4,		%eax		/* dst <<< s */
-	mov	%ebx,		%r11d		/* (NEXT STEP) y' = %ebx */
-	add	%ebx,		%eax		/* dst += x */
-	lea	-421815835(%edx,%r10d),%edx		/* Const + dst + ... */
-	mov	15*4(%rsi),%r10d		/* (NEXT STEP) X[15] */
-	xor	%ecx,		%r11d		/* z ^ ... */
-	xor	%eax,		%r11d		/* x ^ ... */
-	add	%r11d,		%edx		/* dst += ... */
-	rol	$11,		%edx		/* dst <<< s */
-	mov	%eax,		%r11d		/* (NEXT STEP) y' = %eax */
-	add	%eax,		%edx		/* dst += x */
-	lea	530742520(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	mov	2*4(%rsi),%r10d		/* (NEXT STEP) X[2] */
-	xor	%ebx,		%r11d		/* z ^ ... */
-	xor	%edx,		%r11d		/* x ^ ... */
-	add	%r11d,		%ecx		/* dst += ... */
-	rol	$16,		%ecx		/* dst <<< s */
-	mov	%edx,		%r11d		/* (NEXT STEP) y' = %edx */
-	add	%edx,		%ecx		/* dst += x */
-	lea	-995338651(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	mov	0*4(%rsi),%r10d		/* (NEXT STEP) X[0] */
-	xor	%eax,		%r11d		/* z ^ ... */
-	xor	%ecx,		%r11d		/* x ^ ... */
-	add	%r11d,		%ebx		/* dst += ... */
-	rol	$23,		%ebx		/* dst <<< s */
-	mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */
-	add	%ecx,		%ebx		/* dst += x */
- mov	0*4(%rsi),	%r10d		/* (NEXT STEP) X[0] */
- mov	$0xffffffff,	%r11d
- xor	%edx,		%r11d		/* (NEXT STEP) not z' = not %edx*/
-	lea	-198630844(%eax,%r10d),%eax		/* Const + dst + ... */
-	or	%ebx,		%r11d		/* x | ... */
-	xor	%ecx,		%r11d		/* y ^ ... */
-	add	%r11d,		%eax		/* dst += ... */
-	mov	7*4(%rsi),%r10d		/* (NEXT STEP) X[7] */
-	mov	$0xffffffff,	%r11d
-	rol	$6,		%eax		/* dst <<< s */
-	xor	%ecx,		%r11d		/* (NEXT STEP) not z' = not %ecx */
-	add	%ebx,		%eax		/* dst += x */
-	lea	1126891415(%edx,%r10d),%edx		/* Const + dst + ... */
-	or	%eax,		%r11d		/* x | ... */
-	xor	%ebx,		%r11d		/* y ^ ... */
-	add	%r11d,		%edx		/* dst += ... */
-	mov	14*4(%rsi),%r10d		/* (NEXT STEP) X[14] */
-	mov	$0xffffffff,	%r11d
-	rol	$10,		%edx		/* dst <<< s */
-	xor	%ebx,		%r11d		/* (NEXT STEP) not z' = not %ebx */
-	add	%eax,		%edx		/* dst += x */
-	lea	-1416354905(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	or	%edx,		%r11d		/* x | ... */
-	xor	%eax,		%r11d		/* y ^ ... */
-	add	%r11d,		%ecx		/* dst += ... */
-	mov	5*4(%rsi),%r10d		/* (NEXT STEP) X[5] */
-	mov	$0xffffffff,	%r11d
-	rol	$15,		%ecx		/* dst <<< s */
-	xor	%eax,		%r11d		/* (NEXT STEP) not z' = not %eax */
-	add	%edx,		%ecx		/* dst += x */
-	lea	-57434055(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	or	%ecx,		%r11d		/* x | ... */
-	xor	%edx,		%r11d		/* y ^ ... */
-	add	%r11d,		%ebx		/* dst += ... */
-	mov	12*4(%rsi),%r10d		/* (NEXT STEP) X[12] */
-	mov	$0xffffffff,	%r11d
-	rol	$21,		%ebx		/* dst <<< s */
-	xor	%edx,		%r11d		/* (NEXT STEP) not z' = not %edx */
-	add	%ecx,		%ebx		/* dst += x */
-	lea	1700485571(%eax,%r10d),%eax		/* Const + dst + ... */
-	or	%ebx,		%r11d		/* x | ... */
-	xor	%ecx,		%r11d		/* y ^ ... */
-	add	%r11d,		%eax		/* dst += ... */
-	mov	3*4(%rsi),%r10d		/* (NEXT STEP) X[3] */
-	mov	$0xffffffff,	%r11d
-	rol	$6,		%eax		/* dst <<< s */
-	xor	%ecx,		%r11d		/* (NEXT STEP) not z' = not %ecx */
-	add	%ebx,		%eax		/* dst += x */
-	lea	-1894986606(%edx,%r10d),%edx		/* Const + dst + ... */
-	or	%eax,		%r11d		/* x | ... */
-	xor	%ebx,		%r11d		/* y ^ ... */
-	add	%r11d,		%edx		/* dst += ... */
-	mov	10*4(%rsi),%r10d		/* (NEXT STEP) X[10] */
-	mov	$0xffffffff,	%r11d
-	rol	$10,		%edx		/* dst <<< s */
-	xor	%ebx,		%r11d		/* (NEXT STEP) not z' = not %ebx */
-	add	%eax,		%edx		/* dst += x */
-	lea	-1051523(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	or	%edx,		%r11d		/* x | ... */
-	xor	%eax,		%r11d		/* y ^ ... */
-	add	%r11d,		%ecx		/* dst += ... */
-	mov	1*4(%rsi),%r10d		/* (NEXT STEP) X[1] */
-	mov	$0xffffffff,	%r11d
-	rol	$15,		%ecx		/* dst <<< s */
-	xor	%eax,		%r11d		/* (NEXT STEP) not z' = not %eax */
-	add	%edx,		%ecx		/* dst += x */
-	lea	-2054922799(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	or	%ecx,		%r11d		/* x | ... */
-	xor	%edx,		%r11d		/* y ^ ... */
-	add	%r11d,		%ebx		/* dst += ... */
-	mov	8*4(%rsi),%r10d		/* (NEXT STEP) X[8] */
-	mov	$0xffffffff,	%r11d
-	rol	$21,		%ebx		/* dst <<< s */
-	xor	%edx,		%r11d		/* (NEXT STEP) not z' = not %edx */
-	add	%ecx,		%ebx		/* dst += x */
-	lea	1873313359(%eax,%r10d),%eax		/* Const + dst + ... */
-	or	%ebx,		%r11d		/* x | ... */
-	xor	%ecx,		%r11d		/* y ^ ... */
-	add	%r11d,		%eax		/* dst += ... */
-	mov	15*4(%rsi),%r10d		/* (NEXT STEP) X[15] */
-	mov	$0xffffffff,	%r11d
-	rol	$6,		%eax		/* dst <<< s */
-	xor	%ecx,		%r11d		/* (NEXT STEP) not z' = not %ecx */
-	add	%ebx,		%eax		/* dst += x */
-	lea	-30611744(%edx,%r10d),%edx		/* Const + dst + ... */
-	or	%eax,		%r11d		/* x | ... */
-	xor	%ebx,		%r11d		/* y ^ ... */
-	add	%r11d,		%edx		/* dst += ... */
-	mov	6*4(%rsi),%r10d		/* (NEXT STEP) X[6] */
-	mov	$0xffffffff,	%r11d
-	rol	$10,		%edx		/* dst <<< s */
-	xor	%ebx,		%r11d		/* (NEXT STEP) not z' = not %ebx */
-	add	%eax,		%edx		/* dst += x */
-	lea	-1560198380(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	or	%edx,		%r11d		/* x | ... */
-	xor	%eax,		%r11d		/* y ^ ... */
-	add	%r11d,		%ecx		/* dst += ... */
-	mov	13*4(%rsi),%r10d		/* (NEXT STEP) X[13] */
-	mov	$0xffffffff,	%r11d
-	rol	$15,		%ecx		/* dst <<< s */
-	xor	%eax,		%r11d		/* (NEXT STEP) not z' = not %eax */
-	add	%edx,		%ecx		/* dst += x */
-	lea	1309151649(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	or	%ecx,		%r11d		/* x | ... */
-	xor	%edx,		%r11d		/* y ^ ... */
-	add	%r11d,		%ebx		/* dst += ... */
-	mov	4*4(%rsi),%r10d		/* (NEXT STEP) X[4] */
-	mov	$0xffffffff,	%r11d
-	rol	$21,		%ebx		/* dst <<< s */
-	xor	%edx,		%r11d		/* (NEXT STEP) not z' = not %edx */
-	add	%ecx,		%ebx		/* dst += x */
-	lea	-145523070(%eax,%r10d),%eax		/* Const + dst + ... */
-	or	%ebx,		%r11d		/* x | ... */
-	xor	%ecx,		%r11d		/* y ^ ... */
-	add	%r11d,		%eax		/* dst += ... */
-	mov	11*4(%rsi),%r10d		/* (NEXT STEP) X[11] */
-	mov	$0xffffffff,	%r11d
-	rol	$6,		%eax		/* dst <<< s */
-	xor	%ecx,		%r11d		/* (NEXT STEP) not z' = not %ecx */
-	add	%ebx,		%eax		/* dst += x */
-	lea	-1120210379(%edx,%r10d),%edx		/* Const + dst + ... */
-	or	%eax,		%r11d		/* x | ... */
-	xor	%ebx,		%r11d		/* y ^ ... */
-	add	%r11d,		%edx		/* dst += ... */
-	mov	2*4(%rsi),%r10d		/* (NEXT STEP) X[2] */
-	mov	$0xffffffff,	%r11d
-	rol	$10,		%edx		/* dst <<< s */
-	xor	%ebx,		%r11d		/* (NEXT STEP) not z' = not %ebx */
-	add	%eax,		%edx		/* dst += x */
-	lea	718787259(%ecx,%r10d),%ecx		/* Const + dst + ... */
-	or	%edx,		%r11d		/* x | ... */
-	xor	%eax,		%r11d		/* y ^ ... */
-	add	%r11d,		%ecx		/* dst += ... */
-	mov	9*4(%rsi),%r10d		/* (NEXT STEP) X[9] */
-	mov	$0xffffffff,	%r11d
-	rol	$15,		%ecx		/* dst <<< s */
-	xor	%eax,		%r11d		/* (NEXT STEP) not z' = not %eax */
-	add	%edx,		%ecx		/* dst += x */
-	lea	-343485551(%ebx,%r10d),%ebx		/* Const + dst + ... */
-	or	%ecx,		%r11d		/* x | ... */
-	xor	%edx,		%r11d		/* y ^ ... */
-	add	%r11d,		%ebx		/* dst += ... */
-	mov	0*4(%rsi),%r10d		/* (NEXT STEP) X[0] */
-	mov	$0xffffffff,	%r11d
-	rol	$21,		%ebx		/* dst <<< s */
-	xor	%edx,		%r11d		/* (NEXT STEP) not z' = not %edx */
-	add	%ecx,		%ebx		/* dst += x */
-	# add old values of A, B, C, D
-	add	%r8d,	%eax
-	add	%r9d,	%ebx
-	add	%r14d,	%ecx
-	add	%r15d,	%edx
-
-	# loop control
-	add	$64,		%rsi		# ptr += 64
-	cmp	%rdi,		%rsi		# cmp end with ptr
-	jb	2b				# jmp if ptr < end
-	# END of loop over 16-word blocks
-1:
-	mov	%eax,		0*4(%rbp)	# ctx->A = A
-	mov	%ebx,		1*4(%rbp)	# ctx->B = B
-	mov	%ecx,		2*4(%rbp)	# ctx->C = C
-	mov	%edx,		3*4(%rbp)	# ctx->D = D
-
-	pop	%r15
-	pop	%r14
-	pop	%r13				# not really useful (r13 is unused)
-	pop	%r12
-	pop	%rbx
-	pop	%rbp
-	ret
-
-#endif /* } USE_MD5_ASM */
@@ -2,7 +2,6 @@
 * RFC 1321 compliant MD5 implementation
 *
 * Copyright (C) 2001-2003 Christophe Devine
- * Copyright (C) 2007-2022 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -39,22 +38,22 @@ static void md5_process(md_context *ctx, const uchar data[CSUM_CHUNK])
 	C = ctx->C;
 	D = ctx->D;

-	X[0] = IVALu(data, 0);
-	X[1] = IVALu(data, 4);
-	X[2] = IVALu(data, 8);
-	X[3] = IVALu(data, 12);
-	X[4] = IVALu(data, 16);
-	X[5] = IVALu(data, 20);
-	X[6] = IVALu(data, 24);
-	X[7] = IVALu(data, 28);
-	X[8] = IVALu(data, 32);
-	X[9] = IVALu(data, 36);
-	X[10] = IVALu(data, 40);
-	X[11] = IVALu(data, 44);
-	X[12] = IVALu(data, 48);
-	X[13] = IVALu(data, 52);
-	X[14] = IVALu(data, 56);
-	X[15] = IVALu(data, 60);
+	X[0] = IVAL(data, 0);
+	X[1] = IVAL(data, 4);
+	X[2] = IVAL(data, 8);
+	X[3] = IVAL(data, 12);
+	X[4] = IVAL(data, 16);
+	X[5] = IVAL(data, 20);
+	X[6] = IVAL(data, 24);
+	X[7] = IVAL(data, 28);
+	X[8] = IVAL(data, 32);
+	X[9] = IVAL(data, 36);
+	X[10] = IVAL(data, 40);
+	X[11] = IVAL(data, 44);
+	X[12] = IVAL(data, 48);
+	X[13] = IVAL(data, 52);
+	X[14] = IVAL(data, 56);
+	X[15] = IVAL(data, 60);

 #define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))

@@ -147,13 +146,6 @@ static void md5_process(md_context *ctx, const uchar data[CSUM_CHUNK])
 	ctx->D += D;
 }

-#ifdef USE_MD5_ASM
-#if CSUM_CHUNK != 64
-#error The MD5 ASM code does not support CSUM_CHUNK != 64
-#endif
-extern void md5_process_asm(md_context *ctx, const void *data, size_t num);
-#endif
-
 void md5_update(md_context *ctx, const uchar *input, uint32 length)
 {
 	uint32 left, fill;
@@ -178,26 +170,17 @@ void md5_update(md_context *ctx, const uchar *input, uint32 length)
 		left = 0;
 	}

-#ifdef USE_MD5_ASM /* { */
-	if (length >= CSUM_CHUNK) {
-		uint32 chunks = length / CSUM_CHUNK;
-		md5_process_asm(ctx, input, chunks);
-		length -= chunks * CSUM_CHUNK;
-		input += chunks * CSUM_CHUNK;
-	}
-#else /* } { */
 	while (length >= CSUM_CHUNK) {
 		md5_process(ctx, input);
 		length -= CSUM_CHUNK;
 		input  += CSUM_CHUNK;
 	}
-#endif /* } */

 	if (length)
 		memcpy(ctx->buffer + left, input, length);
 }

-static const uchar md5_padding[CSUM_CHUNK] = { 0x80 };
+static uchar md5_padding[CSUM_CHUNK] = { 0x80 };

 void md5_result(md_context *ctx, uchar digest[MD5_DIGEST_LEN])
 {
@@ -209,8 +192,8 @@ void md5_result(md_context *ctx, uchar digest[MD5_DIGEST_LEN])
 	     | (ctx->totalN2 <<  3);
 	low  = (ctx->totalN <<  3);

-	SIVALu(msglen, 0, low);
-	SIVALu(msglen, 4, high);
+	SIVAL(msglen, 0, low);
+	SIVAL(msglen, 4, high);

 	last = ctx->totalN & 0x3F;
 	padn = last < 56 ? 56 - last : 120 - last;
@@ -218,14 +201,12 @@ void md5_result(md_context *ctx, uchar digest[MD5_DIGEST_LEN])
 	md5_update(ctx, md5_padding, padn);
 	md5_update(ctx, msglen, 8);

-	SIVALu(digest, 0, ctx->A);
-	SIVALu(digest, 4, ctx->B);
-	SIVALu(digest, 8, ctx->C);
-	SIVALu(digest, 12, ctx->D);
+	SIVAL(digest, 0, ctx->A);
+	SIVAL(digest, 4, ctx->B);
+	SIVAL(digest, 8, ctx->C);
+	SIVAL(digest, 12, ctx->D);
 }

-#ifdef TEST_MD5 /* { */
-
 void get_md5(uchar *out, const uchar *input, int n)
 {
 	md_context ctx;
@@ -234,6 +215,8 @@ void get_md5(uchar *out, const uchar *input, int n)
 	md5_result(&ctx, out);
 }

+#ifdef TEST_MD5
+
 #include <stdlib.h>
 #include <stdio.h>

@@ -318,4 +301,4 @@ int main(int argc, char *argv[])
 	return 0;
 }

-#endif /* } */
+#endif
@@ -4,7 +4,7 @@
 * An implementation of MD4 designed for use in the SMB authentication protocol.
 *
 * Copyright (C) 1997-1998 Andrew Tridgell
- * Copyright (C) 2005-2020 Wayne Davison
+ * Copyright (C) 2005-2008 Wayne Davison
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -89,8 +89,8 @@ static void copy64(uint32 *M, const uchar *in)
 	int i;

 	for (i = 0; i < MD4_DIGEST_LEN; i++) {
-		M[i] = ((uint32)in[i*4+3] << 24) | ((uint32)in[i*4+2] << 16)
-		     | ((uint32)in[i*4+1] << 8)  | ((uint32)in[i*4+0] << 0);
+		M[i] = (in[i*4+3] << 24) | (in[i*4+2] << 16)
+		     | (in[i*4+1] << 8)  | (in[i*4+0] << 0);
 	}
 }

@@ -193,8 +193,6 @@ void mdfour_result(md_context *md, uchar digest[MD4_DIGEST_LEN])
 	copy4(digest+12, m->D);
 }

-#ifdef TEST_MDFOUR
-
 void mdfour(uchar digest[MD4_DIGEST_LEN], uchar *in, int length)
 {
 	md_context md;
@@ -203,6 +201,7 @@ void mdfour(uchar digest[MD4_DIGEST_LEN], uchar *in, int length)
 	mdfour_result(&md, digest);
 }

+#ifdef TEST_MDFOUR
 int protocol_version = 28;

 static void file_checksum1(char *fname)
@@ -1,10 +1,10 @@
 /* The include file for both the MD4 and MD5 routines. */

-#ifdef USE_OPENSSL
-#include <openssl/sha.h>
-#include <openssl/evp.h>
-#endif
-#include "md-defines.h"
+#define MD4_DIGEST_LEN 16
+#define MD5_DIGEST_LEN 16
+#define MAX_DIGEST_LEN MD5_DIGEST_LEN
+
+#define CSUM_CHUNK 64

 typedef struct {
 	uint32 A, B, C, D;
@@ -17,6 +17,10 @@ void mdfour_begin(md_context *md);
 void mdfour_update(md_context *md, const uchar *in, uint32 length);
 void mdfour_result(md_context *md, uchar digest[MD4_DIGEST_LEN]);

+void get_mdfour(uchar digest[MD4_DIGEST_LEN], const uchar *in, int length);
+
 void md5_begin(md_context *ctx);
 void md5_update(md_context *ctx, const uchar *input, uint32 length);
 void md5_result(md_context *ctx, uchar digest[MD5_DIGEST_LEN]);
+
+void get_md5(uchar digest[MD5_DIGEST_LEN], const uchar *input, int n);
@@ -4,7 +4,7 @@
 * Copyright (C) 1996 Andrew Tridgell
 * Copyright (C) 1996 Paul Mackerras
 * Copyright (C) 2001 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2019 Wayne Davison
+ * Copyright (C) 2003, 2006 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ pool_alloc, pool_free, pool_free_old, pool_talloc, pool_tfree, pool_create, pool
 .SH SYNOPSIS
 .B #include "pool_alloc.h"

-\fBstruct alloc_pool *pool_create(size_t \fIsize\fB, size_t \fIquantum\fB, void (*\fIbomb\fB)(char*,char*,int), int \fIflags\fB);
+\fBstruct alloc_pool *pool_create(size_t \fIsize\fB, size_t \fIquantum\fB, void (*\fIbomb\fB)(char *), int \fIflags\fB);

 \fBvoid pool_destroy(struct alloc_pool *\fIpool\fB);

@@ -95,39 +95,25 @@ for
 .I quantum
 will produce a quantum that should meet maximal alignment
 on most platforms.
-Unless
-.B POOL_NO_QALIGN
+If
+.B POOL_QALIGN
 is set in the
 .IR flags ,
 allocations will be aligned to addresses that are a
 multiple of
 .IR quantum .
-A
-.B NULL
-may be specified for the
-.I bomb
-function pointer if it is not needed.  (See the
-.B pool_alloc()
-function for how it is used.)
 If
 .B POOL_CLEAR
 is set in the
 .IR flags ,
 all allocations from the pool will be initialized to zeros.
-If either
-.B POOL_PREPEND
-or
-.B POOL_INTERN
-is specified in the
-.IR flags ,
-each extent's data structure will be allocated at the start of the
-.IR size -length
-buffer (rather than as a separate, non-pool allocation), with the
-former extending the
-.I size
-to hold the structure, and the latter subtracting the structure's
-length from the indicated
-.IR size .
+You may specify a
+.B NULL
+for the
+.I bomb
+function pointer if you don't wish to use it.  (See the
+.B pool_alloc()
+function for how it is used.)
 .P
 .B pool_destroy()
 destroys an allocation
@@ -145,8 +131,8 @@ is
 .BR 0 ,
 .I quantum
 bytes will be allocated.
-If the pool has been created without
-.BR POOL_NO_QALIGN ,
+If the pool has been created with
+.BR POOL_QALIGN ,
 every chunk of memory that is returned will be suitably aligned.
 You can use this with the default
 .I quantum
@@ -183,7 +169,7 @@ an extent), its memory will be completely freed back to the system.
 If
 .I addr
 is
-.BR NULL ,
+.BR 0 ,
 no memory will be freed, but subsequent allocations will come
 from a new extent.
 .P
@@ -2,19 +2,18 @@

 #define POOL_DEF_EXTENT	(32 * 1024)

-#define POOL_QALIGN_P2		(1<<16)		/* power-of-2 qalign	*/
-
 struct alloc_pool
 {
 	size_t			size;		/* extent size		*/
 	size_t			quantum;	/* allocation quantum	*/
 	struct pool_extent	*extents;	/* top extent is "live" */
-	void			(*bomb)(const char*, const char*, int);	/* called if malloc fails */
+	void			(*bomb)();	/* function to call if
+						 * malloc fails		*/
 	int			flags;

 	/* statistical data */
 	unsigned long		e_created;	/* extents created	*/
-	unsigned long		e_freed;	/* extents destroyed	*/
+	unsigned long		e_freed;	/* extents detroyed	*/
 	int64			n_allocated;	/* calls to alloc	*/
 	int64			n_freed;	/* calls to free	*/
 	int64			b_allocated;	/* cum. bytes allocated	*/
@@ -23,18 +22,16 @@ struct alloc_pool

 struct pool_extent
 {
-	struct pool_extent	*next;
 	void			*start;		/* starting address	*/
 	size_t			free;		/* free bytecount	*/
-	size_t			bound;		/* trapped free bytes	*/
+	size_t			bound;		/* bytes bound by padding,
+						 * overhead and freed	*/
+	struct pool_extent	*next;
 };

 struct align_test {
-	uchar foo;
-	union {
-	    int64 i;
-	    void *p;
-	} bar;
+	void *foo;
+	int64 bar;
 };

 #define MINALIGN	offsetof(struct align_test, bar)
@@ -42,73 +39,24 @@ struct align_test {
 /* Temporarily cast a void* var into a char* var when adding an offset (to
 * keep some compilers from complaining about the pointer arithmetic). */
 #define PTR_ADD(b,o)	( (void*) ((char*)(b) + (o)) )
-#define PTR_SUB(b,o)	( (void*) ((char*)(b) - (o)) )
-
-/* Under AddressSanitizer, fence each pool_alloc() chunk with a poisoned
- * redzone just below it (allocations grow downward from the top of an extent).
- * A bump allocator hands out chunks from one big malloc, so ASan cannot see a
- * write that underflows one chunk into its neighbour -- e.g. a miscomputed
- * F_SUM() reaching before a file_struct's extras.  The redzone turns that into
- * a hard ASan report.  We unpoison a whole extent whenever its space is reused
- * (reset/reclaim), so legitimate later allocations never trip over old
- * redzones; ASan unpoisons freed extents itself via free(). */
-#if defined(__SANITIZE_ADDRESS__)
-# define POOL_ASAN 1
-#elif defined(__has_feature)
-# if __has_feature(address_sanitizer)
-#  define POOL_ASAN 1
-# endif
-#endif
-
-#ifdef POOL_ASAN
-# include <sanitizer/asan_interface.h>
-# define POOL_REDZONE 16  /* >= the largest pool-relative underflow we guard */
-# define POOL_POISON(p,n)   ASAN_POISON_MEMORY_REGION((p), (n))
-# define POOL_UNPOISON(p,n) ASAN_UNPOISON_MEMORY_REGION((p), (n))
-#else
-# define POOL_POISON(p,n)   ((void)0)
-# define POOL_UNPOISON(p,n) ((void)0)
-#endif

 alloc_pool_t
-pool_create(size_t size, size_t quantum, void (*bomb)(const char*, const char*, int), int flags)
+pool_create(size_t size, size_t quantum, void (*bomb)(const char *), int flags)
 {
-	struct alloc_pool *pool;
+	struct alloc_pool	*pool;

-	if ((MINALIGN & (MINALIGN - 1)) != (0)) {
-		if (bomb)
-			(*bomb)("Compiler error: MINALIGN is not a power of 2", __FILE__, __LINE__);
-		return NULL;
-	}
-
-	if (!(pool = new0(struct alloc_pool)))
-		return NULL;
-
-	if (!size)
-		size = POOL_DEF_EXTENT;
-	if (!quantum)
-		quantum = MINALIGN;
+	if (!(pool = new(struct alloc_pool)))
+		return pool;
+	memset(pool, 0, sizeof (struct alloc_pool));

+	pool->size = size	/* round extent size to min alignment reqs */
+	    ? (size + MINALIGN - 1) & ~(MINALIGN - 1)
+	    : POOL_DEF_EXTENT;
 	if (flags & POOL_INTERN) {
-		if (size <= sizeof (struct pool_extent))
-			size = quantum;
-		else
-			size -= sizeof (struct pool_extent);
-		flags |= POOL_PREPEND;
+		pool->size -= sizeof (struct pool_extent);
+		flags |= POOL_APPEND;
 	}
-
-	if (quantum <= 1)
-		flags = (flags | POOL_NO_QALIGN) & ~POOL_QALIGN_P2;
-	else if (!(flags & POOL_NO_QALIGN)) {
-		if (size % quantum)
-			size += quantum - size % quantum;
-		/* If quantum is a power of 2, we'll avoid using modulus. */
-		if (!(quantum & (quantum - 1)))
-			flags |= POOL_QALIGN_P2;
-	}
-
-	pool->size = size;
-	pool->quantum = quantum;
+	pool->quantum = quantum ? quantum : MINALIGN;
 	pool->bomb = bomb;
 	pool->flags = flags;

@@ -119,21 +67,17 @@ void
 pool_destroy(alloc_pool_t p)
 {
 	struct alloc_pool *pool = (struct alloc_pool *) p;
-	struct pool_extent *cur, *next;
+	struct pool_extent	*cur, *next;

 	if (!pool)
 		return;

 	for (cur = pool->extents; cur; cur = next) {
 		next = cur->next;
-		if (pool->flags & POOL_PREPEND)
-			free(PTR_SUB(cur->start, sizeof (struct pool_extent)));
-		else {
-			free(cur->start);
+		free(cur->start);
+		if (!(pool->flags & POOL_APPEND))
 			free(cur);
-		}
 	}
-
 	free(pool);
 }

@@ -146,40 +90,45 @@ pool_alloc(alloc_pool_t p, size_t len, const char *bomb_msg)

 	if (!len)
 		len = pool->quantum;
-	else if (pool->flags & POOL_QALIGN_P2) {
-		if (len & (pool->quantum - 1))
-			len += pool->quantum - (len & (pool->quantum - 1));
-	} else if (!(pool->flags & POOL_NO_QALIGN)) {
-		if (len % pool->quantum)
-			len += pool->quantum - len % pool->quantum;
-	}
+	else if (pool->quantum > 1 && len % pool->quantum)
+		len += pool->quantum - len % pool->quantum;

 	if (len > pool->size)
 		goto bomb_out;

 	if (!pool->extents || len > pool->extents->free) {
-		void *start;
-		size_t asize;
+		void	*start;
+		size_t	free;
+		size_t	bound;
+		size_t	skew;
+		size_t	asize;
 		struct pool_extent *ext;

+		free = pool->size;
+		bound = 0;
+
 		asize = pool->size;
-		if (pool->flags & POOL_PREPEND)
+		if (pool->flags & POOL_APPEND)
 			asize += sizeof (struct pool_extent);

 		if (!(start = new_array(char, asize)))
 			goto bomb_out;

 		if (pool->flags & POOL_CLEAR)
-			memset(start, 0, asize);
+			memset(start, 0, free);

-		if (pool->flags & POOL_PREPEND) {
-			ext = start;
-			start = PTR_ADD(start, sizeof (struct pool_extent));
-		} else if (!(ext = new(struct pool_extent)))
+		if (pool->flags & POOL_APPEND)
+			ext = PTR_ADD(start, free);
+		else if (!(ext = new(struct pool_extent)))
 			goto bomb_out;
+		if (pool->flags & POOL_QALIGN && pool->quantum > 1
+		    && (skew = (size_t)PTR_ADD(start, free) % pool->quantum)) {
+			bound  += skew;
+			free -= skew;
+		}
 		ext->start = start;
-		ext->free = pool->size;
-		ext->bound = 0;
+		ext->free = free;
+		ext->bound = bound;
 		ext->next = pool->extents;
 		pool->extents = ext;

@@ -191,22 +140,11 @@ pool_alloc(alloc_pool_t p, size_t len, const char *bomb_msg)

 	pool->extents->free -= len;

-	{
-		void *ret = PTR_ADD(pool->extents->start, pool->extents->free);
-#ifdef POOL_ASAN
-		size_t rz = pool->extents->free < POOL_REDZONE
-			  ? pool->extents->free : POOL_REDZONE;
-		if (rz) {
-			pool->extents->free -= rz;
-			POOL_POISON(PTR_ADD(pool->extents->start, pool->extents->free), rz);
-		}
-#endif
-		return ret;
-	}
+	return PTR_ADD(pool->extents->start, pool->extents->free);

  bomb_out:
 	if (pool->bomb)
-		(*pool->bomb)(bomb_msg, __FILE__, __LINE__);
+		(*pool->bomb)(bomb_msg);
 	return NULL;
 }

@@ -222,24 +160,10 @@ pool_free(alloc_pool_t p, size_t len, void *addr)
 	if (!pool)
 		return;

-	if (!addr) {
-		/* A NULL addr starts a fresh extent for new allocations. */
-		if ((cur = pool->extents) != NULL && cur->free != pool->size) {
-			cur->bound += cur->free;
-			cur->free = 0;
-		}
-		return;
-	}
-
 	if (!len)
 		len = pool->quantum;
-	else if (pool->flags & POOL_QALIGN_P2) {
-		if (len & (pool->quantum - 1))
-			len += pool->quantum - (len & (pool->quantum - 1));
-	} else if (!(pool->flags & POOL_NO_QALIGN)) {
-		if (len % pool->quantum)
-			len += pool->quantum - len % pool->quantum;
-	}
+	else if (pool->quantum > 1 && len % pool->quantum)
+		len += pool->quantum - len % pool->quantum;

 	pool->n_freed++;
 	pool->b_freed += len;
@@ -252,19 +176,22 @@ pool_free(alloc_pool_t p, size_t len, void *addr)
 	if (!cur)
 		return;

-	/* This extent's space may be reused (and POOL_CLEAR may memset it)
-	 * below, so drop any redzones in it first. */
-	POOL_UNPOISON(cur->start, pool->size);
-
 	if (!prev) {
 		/* The "live" extent is kept ready for more allocations. */
 		if (cur->free + cur->bound + len >= pool->size) {
+			size_t skew;
+
 			if (pool->flags & POOL_CLEAR) {
 				memset(PTR_ADD(cur->start, cur->free), 0,
 				       pool->size - cur->free);
 			}
 			cur->free = pool->size;
 			cur->bound = 0;
+			if (pool->flags & POOL_QALIGN && pool->quantum > 1
+			    && (skew = (size_t)PTR_ADD(cur->start, cur->free) % pool->quantum)) {
+				cur->bound += skew;
+				cur->free -= skew;
+			}
 		} else if (addr == PTR_ADD(cur->start, cur->free)) {
 			if (pool->flags & POOL_CLEAR)
 				memset(addr, 0, len);
@@ -276,12 +203,9 @@ pool_free(alloc_pool_t p, size_t len, void *addr)

 		if (cur->free + cur->bound >= pool->size) {
 			prev->next = cur->next;
-			if (pool->flags & POOL_PREPEND)
-				free(PTR_SUB(cur->start, sizeof (struct pool_extent)));
-			else {
-				free(cur->start);
+			free(cur->start);
+			if (!(pool->flags & POOL_APPEND))
 				free(cur);
-			}
 			pool->e_freed++;
 		} else if (prev != pool->extents) {
 			/* Move the extent to be the first non-live extent. */
@@ -313,18 +237,23 @@ pool_free_old(alloc_pool_t p, void *addr)
 	if (!cur)
 		return;

-	POOL_UNPOISON(cur->start, pool->size);
-
 	if (addr == PTR_ADD(cur->start, cur->free)) {
 		if (prev) {
 			prev->next = NULL;
 			next = cur;
 		} else {
+			size_t skew;
+
 			/* The most recent live extent can just be reset. */
 			if (pool->flags & POOL_CLEAR)
 				memset(addr, 0, pool->size - cur->free);
 			cur->free = pool->size;
 			cur->bound = 0;
+			if (pool->flags & POOL_QALIGN && pool->quantum > 1
+			    && (skew = (size_t)PTR_ADD(cur->start, cur->free) % pool->quantum)) {
+				cur->bound += skew;
+				cur->free -= skew;
+			}
 			next = cur->next;
 			cur->next = NULL;
 		}
@@ -335,12 +264,9 @@ pool_free_old(alloc_pool_t p, void *addr)

 	while ((cur = next) != NULL) {
 		next = cur->next;
-		if (pool->flags & POOL_PREPEND)
-			free(PTR_SUB(cur->start, sizeof (struct pool_extent)));
-		else {
-			free(cur->start);
+		free(cur->start);
+		if (!(pool->flags & POOL_APPEND))
 			free(cur);
-		}
 		pool->e_freed++;
 	}
 }
@@ -387,7 +313,7 @@ int
 pool_stats(alloc_pool_t p, int fd, int summarize)
 {
 	struct alloc_pool *pool = (struct alloc_pool *) p;
-	struct pool_extent *cur;
+	struct pool_extent	*cur;
 	char buf[BUFSIZ];
 	int ret = 0;

@@ -1,13 +1,13 @@
 #include <stddef.h>

 #define POOL_CLEAR	(1<<0)		/* zero fill allocations	*/
-#define POOL_NO_QALIGN	(1<<1)		/* don't align data to quanta	*/
+#define POOL_QALIGN	(1<<1)		/* align data to quanta		*/
 #define POOL_INTERN	(1<<2)		/* Allocate extent structures	*/
-#define POOL_PREPEND	(1<<3)		/*   or prepend to extent data	*/
+#define POOL_APPEND	(1<<3)		/*   or appended to extent data	*/

 typedef void *alloc_pool_t;

-alloc_pool_t pool_create(size_t size, size_t quantum, void (*bomb)(const char*, const char*, int), int flags);
+alloc_pool_t pool_create(size_t size, size_t quantum, void (*bomb)(const char *), int flags);
 void pool_destroy(alloc_pool_t pool);
 void *pool_alloc(alloc_pool_t pool, size_t size, const char *bomb_msg);
 void pool_free(alloc_pool_t pool, size_t size, void *addr);
@@ -3,7 +3,7 @@
 * Version 2.2.x
 * Portable SMB ACL interface
 * Copyright (C) Jeremy Allison 2000
- * Copyright (C) 2007-2022 Wayne Davison
+ * Copyright (C) 2007-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -139,9 +139,7 @@ typedef struct acl *SMB_ACL_ENTRY_T;

 /* Based on the Solaris & UnixWare code. */

-#ifndef __TANDEM
 #undef GROUP
-#endif
 #include <sys/aclv.h>

 /* SVR4.2 ES/MP ACLs */
@@ -232,7 +230,7 @@ struct new_acl_entry{

 #define SMB_ACL_ENTRY_T		struct new_acl_entry*
 #define SMB_ACL_T		struct acl_entry_link*
-
+ 
 #define SMB_ACL_TAG_T		unsigned short
 #define SMB_ACL_TYPE_T		int

@@ -301,18 +299,7 @@ int sys_acl_valid(SMB_ACL_T theacl);
 int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
 int sys_acl_set_fd(int fd, SMB_ACL_T theacl);
 int sys_acl_delete_def_file(const char *name);
-#ifdef HAVE_SOLARIS_ACLS
-SMB_ACL_T sys_acl_get_fd_type(int fd, SMB_ACL_TYPE_T type);
-int sys_acl_set_fd_type(int fd, SMB_ACL_TYPE_T type, SMB_ACL_T theacl);
-int sys_acl_delete_def_fd(int fd);
-#endif
 int sys_acl_free_acl(SMB_ACL_T the_acl);
 int no_acl_syscall_error(int err);

-#ifdef HAVE_LIBACL_AT
-SMB_ACL_T sys_acl_get_file_at(int dirfd, const char *path_p, int at_flags, SMB_ACL_TYPE_T type);
-int sys_acl_set_file_at(int dirfd, const char *path_p, int at_flags, SMB_ACL_TYPE_T type, SMB_ACL_T theacl);
-int sys_acl_delete_def_file_at(int dirfd, const char *path_p, int at_flags);
-#endif
-
 #endif /* SUPPORT_ACLS */
@@ -2,7 +2,7 @@
 * Extended attribute support for rsync.
 *
 * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2003-2022 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
 * Written by Jay Fenlason.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -24,10 +24,6 @@

 #ifdef SUPPORT_XATTRS

-#ifdef HAVE_OSX_XATTRS
-#define GETXATTR_FETCH_LIMIT (64*1024*1024)
-#endif
-
 #if defined HAVE_LINUX_XATTRS

 ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
@@ -45,53 +41,21 @@ int sys_lsetxattr(const char *path, const char *name, const void *value, size_t
 	return lsetxattr(path, name, value, size, 0);
 }

-int sys_fsetxattr(int filedes, const char *name, const void *value, size_t size)
-{
-	return fsetxattr(filedes, name, value, size, 0);
-}
-
 int sys_lremovexattr(const char *path, const char *name)
 {
 	return lremovexattr(path, name);
 }

-int sys_fremovexattr(int filedes, const char *name)
-{
-	return fremovexattr(filedes, name);
-}
-
 ssize_t sys_llistxattr(const char *path, char *list, size_t size)
 {
 	return llistxattr(path, list, size);
 }

-ssize_t sys_flistxattr(int filedes, char *list, size_t size)
-{
-	return flistxattr(filedes, list, size);
-}
-
 #elif HAVE_OSX_XATTRS

 ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
 {
-	ssize_t len = getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
-
-	/* If we're retrieving data, handle resource forks > 64MB specially */
-	if (value != NULL && len == GETXATTR_FETCH_LIMIT && (size_t)len < size) {
-		/* getxattr will only return 64MB of data at a time, need to call again with a new offset */
-		u_int32_t offset = len;
-		size_t data_retrieved = len;
-		while (data_retrieved < size) {
-			len = getxattr(path, name, (char*)value + offset, size - data_retrieved, offset, XATTR_NOFOLLOW);
-			if (len <= 0)
-				break;
-			data_retrieved += len;
-			offset += (u_int32_t)len;
-		}
-		len = data_retrieved;
-	}
-
-	return len;
+	return getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
 }

 ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size)
@@ -104,31 +68,16 @@ int sys_lsetxattr(const char *path, const char *name, const void *value, size_t
 	return setxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
 }

-int sys_fsetxattr(int filedes, const char *name, const void *value, size_t size)
-{
-	return fsetxattr(filedes, name, value, size, 0, 0);
-}
-
 int sys_lremovexattr(const char *path, const char *name)
 {
 	return removexattr(path, name, XATTR_NOFOLLOW);
 }

-int sys_fremovexattr(int filedes, const char *name)
-{
-	return fremovexattr(filedes, name, 0);
-}
-
 ssize_t sys_llistxattr(const char *path, char *list, size_t size)
 {
 	return listxattr(path, list, size, XATTR_NOFOLLOW);
 }

-ssize_t sys_flistxattr(int filedes, char *list, size_t size)
-{
-	return flistxattr(filedes, list, size, 0);
-}
-
 #elif HAVE_FREEBSD_XATTRS

 ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
@@ -146,46 +95,27 @@ int sys_lsetxattr(const char *path, const char *name, const void *value, size_t
 	return extattr_set_link(path, EXTATTR_NAMESPACE_USER, name, value, size);
 }

-int sys_fsetxattr(int filedes, const char *name, const void *value, size_t size)
-{
-	return extattr_set_fd(filedes, EXTATTR_NAMESPACE_USER, name, value, size);
-}
-
 int sys_lremovexattr(const char *path, const char *name)
 {
 	return extattr_delete_link(path, EXTATTR_NAMESPACE_USER, name);
 }

-int sys_fremovexattr(int filedes, const char *name)
-{
-	return extattr_delete_fd(filedes, EXTATTR_NAMESPACE_USER, name);
-}
-
-/* Turn the FreeBSD extattr_list_xx() output (a single length byte before each
- * name, no '\0' terminator) into the series of null-terminated strings that the
- * rest of rsync expects.  Since the size is unchanged, transform in place.
- * Shared by the path and fd list variants. */
-static ssize_t freebsd_list_finish(char *list, size_t size, ssize_t len)
+ssize_t sys_llistxattr(const char *path, char *list, size_t size)
 {
 	unsigned char keylen;
-	ssize_t off;
+	ssize_t off, len = extattr_list_link(path, EXTATTR_NAMESPACE_USER, list, size);

-	if (len <= 0 || size == 0)
+	if (len <= 0 || (size_t)len > size)
 		return len;

-	if ((size_t)len >= size) {
-		/* FreeBSD extattr_list_xx() returns 'size' as 'len' in case there are
-		   more data available, truncating the output, we solve this by signalling
-		   ERANGE in case len == size so that the code in xattrs.c will retry with
-		   a bigger buffer */
-		errno = ERANGE;
-		return -1;
-	}
-
+	/* FreeBSD puts a single-byte length before each string, with no '\0'
+	 * terminator.  We need to change this into a series of null-terminted
+	 * strings.  Since the size is the same, we can simply transform the
+	 * output in place. */
 	for (off = 0; off < len; off += keylen + 1) {
 		keylen = ((unsigned char*)list)[off];
 		if (off + keylen >= len) {
-			/* Should be impossible, but bugs happen! */
+			/* Should be impossible, but kernel bugs happen! */
 			errno = EINVAL;
 			return -1;
 		}
@@ -196,227 +126,6 @@ static ssize_t freebsd_list_finish(char *list, size_t size, ssize_t len)
 	return len;
 }

-ssize_t sys_llistxattr(const char *path, char *list, size_t size)
-{
-	return freebsd_list_finish(list, size,
-		extattr_list_link(path, EXTATTR_NAMESPACE_USER, list, size));
-}
-
-ssize_t sys_flistxattr(int filedes, char *list, size_t size)
-{
-	return freebsd_list_finish(list, size,
-		extattr_list_fd(filedes, EXTATTR_NAMESPACE_USER, list, size));
-}
-
-#elif HAVE_SOLARIS_XATTRS
-
-static ssize_t read_xattr(int attrfd, void *buf, size_t buflen)
-{
-	STRUCT_STAT sb;
-	ssize_t ret;
-
-	if (fstat(attrfd, &sb) < 0)
-		ret = -1;
-	else if (sb.st_size > SSIZE_MAX) {
-		errno = ERANGE;
-		ret = -1;
-	} else if (buflen == 0)
-		ret = sb.st_size;
-	else if (sb.st_size > buflen) {
-		errno = ERANGE;
-		ret = -1;
-	} else {
-		size_t bufpos;
-		for (bufpos = 0; bufpos < sb.st_size; ) {
-			ssize_t cnt = read(attrfd, (char*)buf + bufpos, sb.st_size - bufpos);
-			if (cnt <= 0) {
-				if (cnt < 0 && errno == EINTR)
-					continue;
-				bufpos = -1;
-				break;
-			}
-			bufpos += cnt;
-		}
-		ret = bufpos;
-	}
-
-	close(attrfd);
-
-	return ret;
-}
-
-ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
-{
-	int attrfd;
-
-	if ((attrfd = attropen(path, name, O_RDONLY)) < 0) {
-		errno = ENOATTR;
-		return -1;
-	}
-
-	return read_xattr(attrfd, value, size);
-}
-
-ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size)
-{
-	int attrfd;
-
-	if ((attrfd = openat(filedes, name, O_RDONLY|O_XATTR, 0)) < 0) {
-		errno = ENOATTR;
-		return -1;
-	}
-
-	return read_xattr(attrfd, value, size);
-}
-
-/* Write a datum to the already-opened attribute fd, closing it.  Shared by the
- * path- and fd-keyed setters below. */
-static int write_xattr(int attrfd, const void *value, size_t size)
-{
-	size_t bufpos;
-	int ret = 0, saved_errno = 0;
-
-	for (bufpos = 0; bufpos < size; ) {
-		ssize_t cnt = write(attrfd, (const char *)value + bufpos, size - bufpos);
-		if (cnt < 0) {
-			if (errno == EINTR)
-				continue;
-			ret = -1;
-			saved_errno = errno;
-			break;
-		}
-		if (cnt == 0) {
-			ret = -1;
-			saved_errno = EIO;
-			break;
-		}
-		bufpos += cnt;
-	}
-
-	/* Don't let close() clobber the write error; do report a close() failure. */
-	if (close(attrfd) < 0 && ret == 0)
-		return -1;
-	if (ret < 0 && saved_errno)
-		errno = saved_errno;
-
-	return ret;
-}
-
-int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size)
-{
-	int attrfd;
-	mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
-
-	if ((attrfd = attropen(path, name, O_CREAT|O_TRUNC|O_WRONLY, mode)) < 0)
-		return -1;
-
-	return write_xattr(attrfd, value, size);
-}
-
-int sys_fsetxattr(int filedes, const char *name, const void *value, size_t size)
-{
-	int attrfd;
-	mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
-
-	if ((attrfd = openat(filedes, name, O_CREAT|O_TRUNC|O_WRONLY|O_XATTR, mode)) < 0)
-		return -1;
-
-	return write_xattr(attrfd, value, size);
-}
-
-int sys_lremovexattr(const char *path, const char *name)
-{
-	int attrdirfd;
-	int ret;
-
-	if ((attrdirfd = attropen(path, ".", O_RDONLY)) < 0)
-		return -1;
-
-	ret = unlinkat(attrdirfd, name, 0);
-
-	close(attrdirfd);
-
-	return ret;
-}
-
-int sys_fremovexattr(int filedes, const char *name)
-{
-	int attrdirfd;
-	int ret;
-
-	if ((attrdirfd = openat(filedes, ".", O_RDONLY|O_XATTR, 0)) < 0)
-		return -1;
-
-	ret = unlinkat(attrdirfd, name, 0);
-
-	close(attrdirfd);
-
-	return ret;
-}
-
-/* List the names in an already-opened attribute-dir fd, consuming it.  Shared
- * by the path- and fd-keyed listers below. */
-static ssize_t list_xattr(int attrdirfd, char *list, size_t size)
-{
-	DIR *dirp;
-	struct dirent *dp;
-	ssize_t ret = 0;
-
-	if ((dirp = fdopendir(attrdirfd)) == NULL) {
-		close(attrdirfd);
-		return -1;
-	}
-
-	while ((dp = readdir(dirp))) {
-		int len = strlen(dp->d_name);
-
-		if (dp->d_name[0] == '.' && (len == 1 || (len == 2 && dp->d_name[1] == '.')))
-			continue;
-		if (len == 11 && dp->d_name[0] == 'S' && strncmp(dp->d_name, "SUNWattr_r", 10) == 0
-		 && (dp->d_name[10] == 'o' || dp->d_name[10] == 'w'))
-			continue;
-
-		ret += len + 1;
-		if ((size_t)ret > size) {
-			if (size == 0)
-				continue;
-			ret = -1;
-			errno = ERANGE;
-			break;
-		}
-		memcpy(list, dp->d_name, len+1);
-		list += len+1;
-	}
-
-	closedir(dirp);
-
-	return ret;
-}
-
-ssize_t sys_llistxattr(const char *path, char *list, size_t size)
-{
-	int attrdirfd;
-
-	if ((attrdirfd = attropen(path, ".", O_RDONLY)) < 0) {
-		errno = ENOTSUP;
-		return -1;
-	}
-
-	return list_xattr(attrdirfd, list, size);
-}
-
-ssize_t sys_flistxattr(int filedes, char *list, size_t size)
-{
-	int attrdirfd;
-
-	if ((attrdirfd = openat(filedes, ".", O_RDONLY|O_XATTR, 0)) < 0) {
-		errno = ENOTSUP;
-		return -1;
-	}
-
-	return list_xattr(attrdirfd, list, size);
-}
-
 #else

 #error You need to create xattr compatibility functions.
@@ -1,9 +1,9 @@
 #ifdef SUPPORT_XATTRS

-#if defined HAVE_SYS_XATTR_H
-#include <sys/xattr.h>
-#elif defined HAVE_ATTR_XATTR_H
+#if defined HAVE_ATTR_XATTR_H
 #include <attr/xattr.h>
+#elif defined HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
 #elif defined HAVE_SYS_EXTATTR_H
 #include <sys/extattr.h>
 #endif
@@ -16,11 +16,8 @@
 ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size);
 ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size);
 int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size);
-int sys_fsetxattr(int filedes, const char *name, const void *value, size_t size);
 int sys_lremovexattr(const char *path, const char *name);
-int sys_fremovexattr(int filedes, const char *name);
 ssize_t sys_llistxattr(const char *path, char *list, size_t size);
-ssize_t sys_flistxattr(int filedes, char *list, size_t size);

 #else

@@ -89,11 +89,6 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
 	    p_ch = *++p;
 	    /* FALLTHROUGH */
 	  default:
-	    /* iwildmatch() folds the text to lower case above; fold the pattern
-	     * char too so matching is truly case-insensitive (not just text-side).
-	     * Without this an upper-case "hosts deny" token fails OPEN. */
-	    if (force_lower_case && ISUPPER(p_ch))
-		p_ch = tolower(p_ch);
 	    if (t_ch != p_ch)
 		return FALSE;
 	    continue;
@@ -155,8 +150,6 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
 		    p_ch = *++p;
 		    if (!p_ch)
 			return ABORT_ALL;
-		    if (force_lower_case && ISUPPER(p_ch))
-			p_ch = tolower(p_ch);
 		    if (t_ch == p_ch)
 			matched = TRUE;
 		} else if (p_ch == '-' && prev_ch && p[1] && p[1] != ']') {
@@ -166,8 +159,6 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
 			if (!p_ch)
 			    return ABORT_ALL;
 		    }
-		    if (force_lower_case && ISUPPER(p_ch))
-			p_ch = tolower(p_ch);
 		    if (t_ch <= p_ch && t_ch >= prev_ch)
 			matched = TRUE;
 		    p_ch = 0; /* This makes "prev_ch" get set to 0. */
@@ -225,12 +216,8 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
 		    } else /* malformed [:class:] string */
 			return ABORT_ALL;
 		    p_ch = 0; /* This makes "prev_ch" get set to 0. */
-		} else {
-		    if (force_lower_case && ISUPPER(p_ch))
-			p_ch = tolower(p_ch);
-		    if (t_ch == p_ch)
-			matched = TRUE;
-		}
+		} else if (t_ch == p_ch)
+		    matched = TRUE;
 	    } while (prev_ch = p_ch, (p_ch = *++p) != ']');
 	    if (matched == special || t_ch == '/')
 		return FALSE;
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
 * Copyright (C) 2000-2001 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2022 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,9 @@
 */

 #include "rsync.h"
-#include "itypes.h"
-#include "inums.h"
-#include "rounding.h"	/* EXTRA_ROUNDING, so log_delete() aligns its file_struct */
+#include "ifuncs.h"

+extern int verbose;
 extern int dry_run;
 extern int am_daemon;
 extern int am_server;
@@ -32,18 +31,18 @@ extern int am_generator;
 extern int local_server;
 extern int quiet;
 extern int module_id;
+extern int msg_fd_out;
 extern int allow_8bit_chars;
 extern int protocol_version;
-extern int always_checksum;
-extern int preserve_mtimes;
-extern int msgs2stderr;
+extern int preserve_times;
+extern int uid_ndx;
+extern int gid_ndx;
+extern int progress_is_active;
 extern int stdout_format_has_i;
 extern int stdout_format_has_o_or_i;
 extern int logfile_format_has_i;
 extern int logfile_format_has_o_or_i;
 extern int receiver_symlink_times;
-extern int64 total_data_written;
-extern int64 total_data_read;
 extern mode_t orig_umask;
 extern char *auth_user;
 extern char *stdout_format;
@@ -53,14 +52,11 @@ extern char *logfile_name;
 extern iconv_t ic_chck;
 #endif
 #ifdef ICONV_OPTION
-extern iconv_t ic_recv;
+extern iconv_t ic_send, ic_recv;
 #endif
+extern char curr_dir[];
 extern char *full_module_path;
 extern unsigned int module_dirlen;
-extern char sender_file_sum[MAX_DIGEST_LEN];
-extern const char undetermined_hostname[];
-
-extern struct name_num_item *xfer_sum_nni, *file_sum_nni;

 static int log_initialised;
 static int logfile_was_closed;
@@ -68,15 +64,10 @@ static FILE *logfile_fp;
 struct stats stats;

 int got_xfer_error = 0;
-int output_needs_newline = 0;
-int send_msgs_to_gen = 0;
-
-static int64 initial_data_written;
-static int64 initial_data_read;

 struct {
-	int code;
-	char const *name;
+        int code;
+        char const *name;
 } const rerr_names[] = {
 	{ RERR_SYNTAX     , "syntax or usage error" },
 	{ RERR_PROTOCOL   , "protocol incompatibility" },
@@ -96,13 +87,13 @@ struct {
 	{ RERR_MALLOC     , "error allocating core memory buffers" },
 	{ RERR_PARTIAL    , "some files/attrs were not transferred (see previous errors)" },
 	{ RERR_VANISHED   , "some files vanished before they could be transferred" },
-	{ RERR_DEL_LIMIT  , "the --max-delete limit stopped deletions" },
 	{ RERR_TIMEOUT    , "timeout in data send/receive" },
 	{ RERR_CONTIMEOUT , "timeout waiting for daemon connection" },
 	{ RERR_CMD_FAILED , "remote shell failed" },
 	{ RERR_CMD_KILLED , "remote shell killed" },
 	{ RERR_CMD_RUN    , "remote command could not be run" },
 	{ RERR_CMD_NOTFOUND,"remote command not found" },
+	{ RERR_DEL_LIMIT  , "the --max-delete limit stopped deletions" },
 	{ 0, NULL }
 };

@@ -119,20 +110,13 @@ static char const *rerr_name(int code)
 	return NULL;
 }

-static void filtered_fwrite(FILE *f, const char *in_buf, int in_len, int use_isprint, int escape_c1, char end_char);
-
 static void logit(int priority, const char *buf)
 {
 	if (logfile_was_closed)
 		logfile_reopen();
 	if (logfile_fp) {
-		/* Escape control chars in the message so an attacker-controlled
-		 * filename can't inject terminal escapes into the log an admin later
-		 * cat's (CWE-117); keep the trailing newline raw via end_char. */
-		int len = strlen(buf);
-		char trailing = len && (buf[len-1] == '\n' || buf[len-1] == '\r') ? buf[--len] : '\0';
-		fprintf(logfile_fp, "%s [%d] ", timestring(time(NULL)), (int)getpid());
-		filtered_fwrite(logfile_fp, buf, len, 0, 1, trailing);
+		fprintf(logfile_fp, "%s [%d] %s",
+			timestring(time(NULL)), (int)getpid(), buf);
 		fflush(logfile_fp);
 	} else {
 		syslog(priority, "%s", buf);
@@ -141,16 +125,21 @@ static void logit(int priority, const char *buf)

 static void syslog_init()
 {
+	static int been_here = 0;
 	int options = LOG_PID;

+	if (been_here)
+		return;
+	been_here = 1;
+
 #ifdef LOG_NDELAY
 	options |= LOG_NDELAY;
 #endif

 #ifdef LOG_DAEMON
-	openlog(lp_syslog_tag(module_id), options, lp_syslog_facility(module_id));
+	openlog("rsyncd", options, lp_syslog_facility(module_id));
 #else
-	openlog(lp_syslog_tag(module_id), options);
+	openlog("rsyncd", options);
 #endif

 #ifndef LOG_NDELAY
@@ -161,15 +150,7 @@ static void syslog_init()
 static void logfile_open(void)
 {
 	mode_t old_umask = umask(022 | orig_umask);
-	/* --log-file/`log file =` are operator-supplied paths that may transit
-	 * attacker-writable dirs; a planted symlink could redirect root's log
-	 * into e.g. /root/.ssh/authorized_keys.  Refuse symlinks not owned by
-	 * uid 0 or our euid. */
-	int fd = vfs_open_owner_walk(logfile_name,
-						O_WRONLY | O_APPEND | O_CREAT, 0644, 0);
-	logfile_fp = fd >= 0 ? fdopen(fd, "a") : NULL;
-	if (!logfile_fp && fd >= 0)
-		close(fd);
+	logfile_fp = fopen(logfile_name, "a");
 	umask(old_umask);
 	if (!logfile_fp) {
 		int fopen_errno = errno;
@@ -178,16 +159,14 @@ static void logfile_open(void)
 		rsyserr(FERROR, fopen_errno,
 			"failed to open log-file %s", logfile_name);
 		rprintf(FINFO, "Ignoring \"log file\" setting.\n");
-		logfile_name = "";
 	}
 }

 void log_init(int restart)
 {
 	if (log_initialised) {
-		if (!restart) /* Note: a restart only happens with am_daemon */
+		if (!restart)
 			return;
-		assert(logfile_name); /* all am_daemon procs got at least an empty string */
 		if (strcmp(logfile_name, lp_log_file(module_id)) != 0) {
 			if (logfile_fp) {
 				fclose(logfile_fp);
@@ -197,8 +176,7 @@ void log_init(int restart)
 			logfile_name = NULL;
 		} else if (*logfile_name)
 			return; /* unchanged, non-empty "log file" names */
-		else if (lp_syslog_facility(-1) != lp_syslog_facility(module_id)
-		      || strcmp(lp_syslog_tag(-1), lp_syslog_tag(module_id)) != 0)
+		else if (lp_syslog_facility(-1) != lp_syslog_facility(module_id))
 			closelog();
 		else
 			return; /* unchanged syslog settings */
@@ -220,7 +198,6 @@ void log_init(int restart)
 		syslog_init();
 }

-/* Note that this close & reopen idiom intentionally ignores syslog logging. */
 void logfile_close(void)
 {
 	if (logfile_fp) {
@@ -238,27 +215,25 @@ void logfile_reopen(void)
 	}
 }

-static void filtered_fwrite(FILE *f, const char *in_buf, int in_len, int use_isprint, int escape_c1, char end_char)
+static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint)
 {
-	char outbuf[1024], *ob = outbuf;
-	const char *end = in_buf + in_len;
-	while (in_buf < end) {
-		if (ob - outbuf >= (int)sizeof outbuf - 10) {
-			if (fwrite(outbuf, ob - outbuf, 1, f) != 1)
+	const char *s, *end = buf + len;
+	for (s = buf; s < end; s++) {
+		if ((s < end - 4
+		  && *s == '\\' && s[1] == '#'
+		  && isDigit(s + 2)
+		  && isDigit(s + 3)
+		  && isDigit(s + 4))
+		 || (*s != '\t'
+		  && ((use_isprint && !isPrint(s))
+		   || *(uchar*)s < ' '))) {
+			if (s != buf && fwrite(buf, s - buf, 1, f) != 1)
 				exit_cleanup(RERR_MESSAGEIO);
-			ob = outbuf;
+			fprintf(f, "\\#%03o", *(uchar*)s);
+			buf = s + 1;
 		}
-		if ((in_buf < end - 4 && *in_buf == '\\' && in_buf[1] == '#'
-		  && isDigit(in_buf + 2) && isDigit(in_buf + 3) && isDigit(in_buf + 4))
-		 || (*in_buf != '\t' && ((use_isprint && !isPrint(in_buf)) || *(uchar*)in_buf < ' '
-		  || (escape_c1 && *(uchar*)in_buf >= 0x80 && *(uchar*)in_buf <= 0x9f))))
-			ob += snprintf(ob, 6, "\\#%03o", *(uchar*)in_buf++);
-		else
-			*ob++ = *in_buf++;
 	}
-	if (end_char) /* The "- 10" above means that there is always room for one more char here. */
-		*ob++ = end_char;
-	if (ob != outbuf && fwrite(outbuf, ob - outbuf, 1, f) != 1)
+	if (buf != end && fwrite(buf, end - buf, 1, f) != 1)
 		exit_cleanup(RERR_MESSAGEIO);
 }

@@ -267,8 +242,8 @@ static void filtered_fwrite(FILE *f, const char *in_buf, int in_len, int use_isp
 * can happen with certain fatal conditions. */
 void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 {
-	char trailing_CR_or_NL;
-	FILE *f = msgs2stderr == 1 ? stderr : stdout;
+	int trailing_CR_or_NL;
+	FILE *f = NULL;
 #ifdef ICONV_OPTION
 	iconv_t ic = is_utf8 && ic_recv != (iconv_t)-1 ? ic_recv : ic_chck;
 #else
@@ -280,21 +255,9 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 	if (len < 0)
 		exit_cleanup(RERR_MESSAGEIO);

-	if (msgs2stderr == 1) {
-		/* A normal daemon can get msgs2stderr set if the socket is busted, so we
-		 * change the message destination into an FLOG message in order to try to
-		 * get some info about an abnormal-exit into the log file. An rsh daemon
-		 * can have this set via user request, so we'll leave the code alone so
-		 * that the msg gets logged and then sent to stderr after that. */
-		if (am_daemon > 0 && code != FCLIENT)
-			code = FLOG;
-	} else if (send_msgs_to_gen) {
-		/* Pass the message to our sibling in native charset.  is_utf8
-		 * may be set here if a malicious peer sends MSG_INFO/MSG_ERROR
-		 * to a daemon receiver (read_a_msg passes !am_generator); the
-		 * old assert(!is_utf8) made that a remotely-reachable abort.
-		 * Forwarding the bytes raw is safe -- the generator's rwrite()
-		 * gets is_utf8=0 and filtered_fwrite escapes non-printables. */
+	if (am_server && msg_fd_out >= 0) {
+		assert(!is_utf8);
+		/* Pass the message to our sibling in native charset. */
 		send_msg((enum msgcode)code, buf, len, 0);
 		return;
 	}
@@ -318,12 +281,7 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 		in_block = 1;
 		if (!log_initialised)
 			log_init(0);
-		/* buf holds exactly len bytes and is not necessarily NUL-terminated
-		 * (e.g. a forwarded MSG_* payload from read_a_msg), so copy by length
-		 * rather than strlcpy(), which would strlen() past the end of buf. */
-		int mlen = MIN((int)sizeof msg - 1, len);
-		memcpy(msg, buf, mlen);
-		msg[mlen] = '\0';
+		strlcpy(msg, buf, MIN((int)sizeof msg, len + 1));
 		logit(priority, msg);
 		in_block = 0;

@@ -332,28 +290,10 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 	} else if (code == FLOG)
 		return;

-	switch (code) {
-	case FERROR_XFER:
-		got_xfer_error = 1;
-		/* FALL THROUGH */
-	case FERROR:
-	case FWARNING:
-		f = stderr;
-		break;
-	case FINFO:
-		if (quiet)
-			return;
-		break;
-	/*case FLOG:*/
-	/*case FCLIENT:*/
-	/*case FERROR_UTF8:*/
-	/*case FERROR_SOCKET:*/
-	default:
-		fprintf(stderr, "Bad logcode in rwrite(): %d [%s]\n", (int)code, who_am_i());
-		exit_cleanup(RERR_MESSAGEIO);
-	}
+	if (quiet && code == FINFO)
+		return;

-	if (am_server && msgs2stderr != 1 && (msgs2stderr != 2 || f != stderr)) {
+	if (am_server) {
 		enum msgcode msg = (enum msgcode)code;
 		if (protocol_version < 30) {
 			if (msg == MSG_ERROR)
@@ -364,25 +304,34 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 		/* Pass the message to the non-server side. */
 		if (send_msg(msg, buf, len, !is_utf8))
 			return;
-		if (am_daemon > 0) {
+		if (am_daemon) {
 			/* TODO: can we send the error to the user somehow? */
 			return;
 		}
+	}
+
+	switch (code) {
+	case FERROR_XFER:
+		got_xfer_error = 1;
+		/* FALL THROUGH */
+	case FERROR:
+	case FWARNING:
 		f = stderr;
+		break;
+	case FINFO:
+		f = am_server ? stderr : stdout;
+		break;
+	default:
+		exit_cleanup(RERR_MESSAGEIO);
 	}

-	if (output_needs_newline) {
+	if (progress_is_active && !am_server) {
 		fputc('\n', f);
-		output_needs_newline = 0;
+		progress_is_active = 0;
 	}

-	trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r') ? buf[--len] : '\0';
-
-	if (len && buf[0] == '\r') {
-		fputc('\r', f);
-		buf++;
-		len--;
-	}
+	trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
+			  ? buf[--len] : 0;

 #ifdef ICONV_CONST
 	if (ic != (iconv_t)-1) {
@@ -391,39 +340,27 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 		int ierrno;

 		INIT_CONST_XBUF(outbuf, convbuf);
-		INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1);
+		INIT_XBUF(inbuf, (char*)buf, len, -1);

 		while (inbuf.len) {
-			iconvbufs(ic, &inbuf, &outbuf, inbuf.pos ? 0 : ICB_INIT);
+			iconvbufs(ic, &inbuf, &outbuf, 0);
 			ierrno = errno;
 			if (outbuf.len) {
-				char trailing = inbuf.len ? '\0' : trailing_CR_or_NL;
-				filtered_fwrite(f, convbuf, outbuf.len, 0, 0, trailing);
-				if (trailing) {
-					trailing_CR_or_NL = '\0';
-					fflush(f);
-				}
+				filtered_fwrite(f, convbuf, outbuf.len, 0);
 				outbuf.len = 0;
 			}
-			/* Log one byte of illegal/incomplete sequence and continue with
-			 * the next character. Check that the buffer is non-empty for the
-			 * sake of robustness. */
-			if ((ierrno == EILSEQ || ierrno == EINVAL) && inbuf.len) {
-				fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++));
-				inbuf.len--;
-			}
-		}
-
-		if (trailing_CR_or_NL) {
-			fputc(trailing_CR_or_NL, f);
-			fflush(f);
+			if (!ierrno || ierrno == E2BIG)
+				continue;
+			fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++));
+			inbuf.len--;
 		}
 	} else
 #endif
-	{
-		filtered_fwrite(f, buf, len, !allow_8bit_chars, 0, trailing_CR_or_NL);
-		if (trailing_CR_or_NL)
-			fflush(f);
+		filtered_fwrite(f, buf, len, !allow_8bit_chars);
+
+	if (trailing_CR_or_NL) {
+		fputc(trailing_CR_or_NL, f);
+		fflush(f);
 	}
 }

@@ -482,17 +419,12 @@ void rsyserr(enum logcode code, int errcode, const char *format, ...)
 	char buf[BIGPATHBUFLEN];
 	size_t len;

-	/* snprintf returns the would-have-been length on truncation, so
-	 * each cumulative call must be guarded; if not, sizeof buf - len
-	 * can underflow when promoted to size_t and the next call writes
-	 * past the buffer. */
-	len = snprintf(buf, sizeof buf, RSYNC_NAME ": [%s] ", who_am_i());
+	strlcpy(buf, RSYNC_NAME ": ", sizeof buf);
+	len = (sizeof RSYNC_NAME ": ") - 1;

-	if (len < sizeof buf) {
-		va_start(ap, format);
-		len += vsnprintf(buf + len, sizeof buf - len, format, ap);
-		va_end(ap);
-	}
+	va_start(ap, format);
+	len += vsnprintf(buf + len, sizeof buf - len, format, ap);
+	va_end(ap);

 	if (len < sizeof buf) {
 		len += snprintf(buf + len, sizeof buf - len,
@@ -506,12 +438,12 @@ void rsyserr(enum logcode code, int errcode, const char *format, ...)

 void rflush(enum logcode code)
 {
-	FILE *f;
+	FILE *f = NULL;

 	if (am_daemon || code == FLOG)
 		return;

-	if (!am_server && (code == FINFO || code == FCLIENT))
+	if (code == FINFO && !am_server)
 		f = stdout;
 	else
 		f = stderr;
@@ -519,23 +451,13 @@ void rflush(enum logcode code)
 	fflush(f);
 }

-void remember_initial_stats(void)
-{
-	initial_data_read = total_data_read;
-	initial_data_written = total_data_written;
-}
-
-/* Size of log_formatted()'s per-escape "fmt" scratch buffer.  log_format_has()
- * must bound its width-digit scan to the same limit so the two parsers agree on
- * where an escape letter falls (see the digit loop in each). */
-#define LOG_FMT_SIZE 32
-
 /* A generic logging routine for send/recv, with parameter substitiution. */
 static void log_formatted(enum logcode code, const char *format, const char *op,
-			  struct file_struct *file, const char *fname, int iflags,
+			  struct file_struct *file, const char *fname,
+			  struct stats *initial_stats, int iflags,
 			  const char *hlink)
 {
-	char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[LOG_FMT_SIZE];
+	char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32];
 	char *p, *s, *c;
 	const char *n;
 	size_t len, total;
@@ -555,45 +477,30 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 	buf[total] = '\0';

 	for (p = buf; (p = strchr(p, '%')) != NULL; ) {
-		int humanize = 0;
 		s = p++;
 		c = fmt + 1;
-		while (*p == '\'') {
-			humanize++;
-			p++;
-		}
 		if (*p == '-')
 			*c++ = *p++;
 		while (isDigit(p) && c - fmt < (int)(sizeof fmt) - 8)
 			*c++ = *p++;
-		while (*p == '\'') {
-			humanize++;
-			p++;
-		}
 		if (!*p)
 			break;
 		*c = '\0';
 		n = NULL;

-		/* Note for %h and %a: it doesn't matter what fd we pass to
-		 * client_{name,addr} because rsync_module will already have
-		 * forced the answer to be cached (assuming, of course, for %h
-		 * that lp_reverse_lookup(module_id) is true). */
 		switch (*p) {
 		case 'h':
-			if (am_daemon) {
-				n = lp_reverse_lookup(module_id)
-				  ? client_name(0) : undetermined_hostname;
-			}
+			if (am_daemon)
+				n = client_name(0);
 			break;
 		case 'a':
 			if (am_daemon)
 				n = client_addr(0);
 			break;
 		case 'l':
-			strlcat(fmt, "s", sizeof fmt);
+			strlcat(fmt, ".0f", sizeof fmt);
 			snprintf(buf2, sizeof buf2, fmt,
-				 do_big_num(F_LENGTH(file), humanize, NULL));
+				 (double)F_LENGTH(file));
 			n = buf2;
 			break;
 		case 'U':
@@ -613,8 +520,9 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 			}
 			break;
 		case 'p':
-			strlcat(fmt, "d", sizeof fmt);
-			snprintf(buf2, sizeof buf2, fmt, (int)getpid());
+			strlcat(fmt, "ld", sizeof fmt);
+			snprintf(buf2, sizeof buf2, fmt,
+				 (long)getpid());
 			n = buf2;
 			break;
 		case 'M':
@@ -647,7 +555,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 					n = buf2;
 			} else if (am_daemon && *c != '/') {
 				pathjoin(buf2, sizeof buf2,
-					 vfs.curr_dir + module_dirlen, c);
+					 curr_dir + module_dirlen, c);
 				clean_fname(buf2, 0);
 				if (fmt[1]) {
 					strlcpy(c, buf2, MAXPATHLEN);
@@ -701,33 +609,28 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 			n = auth_user;
 			break;
 		case 'b':
-		case 'c':
-			if (!(iflags & ITEM_TRANSFER))
-				b = 0;
-			else if ((!!am_sender) ^ (*p == 'c'))
-				b = total_data_written - initial_data_written;
-			else
-				b = total_data_read - initial_data_read;
-			strlcat(fmt, "s", sizeof fmt);
-			snprintf(buf2, sizeof buf2, fmt,
-				 do_big_num(b, humanize, NULL));
+			if (am_sender) {
+				b = stats.total_written -
+					initial_stats->total_written;
+			} else {
+				b = stats.total_read -
+					initial_stats->total_read;
+			}
+			strlcat(fmt, ".0f", sizeof fmt);
+			snprintf(buf2, sizeof buf2, fmt, (double)b);
 			n = buf2;
 			break;
-		case 'C':
-			n = NULL;
-			if (S_ISREG(file->mode)) {
-				if (always_checksum && !(iflags & ITEM_DELETED))
-					n = sum_as_hex(file_sum_nni->num, F_SUM(file), 1);
-				else if (iflags & ITEM_TRANSFER)
-					n = sum_as_hex(xfer_sum_nni->num, sender_file_sum, 0);
-			}
-			if (!n) {
-				int sum_len = csum_len_for_type(always_checksum ? file_sum_nni->num : xfer_sum_nni->num,
-								always_checksum);
-				memset(buf2, ' ', sum_len*2);
-				buf2[sum_len*2] = '\0';
-				n = buf2;
+		case 'c':
+			if (!am_sender) {
+				b = stats.total_written -
+					initial_stats->total_written;
+			} else {
+				b = stats.total_read -
+					initial_stats->total_read;
 			}
+			strlcat(fmt, ".0f", sizeof fmt);
+			snprintf(buf2, sizeof buf2, fmt, (double)b);
+			n = buf2;
 			break;
 		case 'i':
 			if (iflags & ITEM_DELETED) {
@@ -736,14 +639,14 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 			}
 			n  = c = buf2 + MAXPATHLEN - 32;
 			c[0] = iflags & ITEM_LOCAL_CHANGE
-			     ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c'
+			      ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c'
 			     : !(iflags & ITEM_TRANSFER) ? '.'
 			     : !local_server && *op == 's' ? '<' : '>';
 			if (S_ISLNK(file->mode)) {
 				c[1] = 'L';
 				c[3] = '.';
 				c[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
-				     : !preserve_mtimes || !receiver_symlink_times
+				     : !preserve_times || !receiver_symlink_times
 				    || (iflags & ITEM_REPORT_TIMEFAIL) ? 'T' : 't';
 			} else {
 				c[1] = S_ISDIR(file->mode) ? 'd'
@@ -751,15 +654,13 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 				     : IS_DEVICE(file->mode) ? 'D' : 'f';
 				c[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
 				c[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
-				     : !preserve_mtimes ? 'T' : 't';
+				     : !preserve_times ? 'T' : 't';
 			}
 			c[2] = !(iflags & ITEM_REPORT_CHANGE) ? '.' : 'c';
 			c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
 			c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
 			c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
-			c[8] = !(iflags & (ITEM_REPORT_ATIME|ITEM_REPORT_CRTIME)) ? '.'
-			     : BITS_SET(iflags, ITEM_REPORT_ATIME|ITEM_REPORT_CRTIME) ? 'b'
-			     : iflags & ITEM_REPORT_ATIME ? 'u' : 'n';
+			c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
 			c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
 			c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
 			c[11] = '\0';
@@ -781,9 +682,6 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 				}
 			}
 			break;
-		case '%':
-			n = "%";
-			break;
 		}

 		/* "n" is the string to be inserted in place of this % code. */
@@ -827,33 +725,19 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 int log_format_has(const char *format, char esc)
 {
 	const char *p;
-	int width;

 	if (!format)
 		return 0;

 	for (p = format; (p = strchr(p, '%')) != NULL; ) {
-		for (p++; *p == '\''; p++) {} /*SHARED ITERATOR*/
-		/* Mirror log_formatted()'s width-digit scan exactly (c starts at
-		 * fmt+1, so width starts at 1): both must stop at the same digit
-		 * or they disagree on where the escape letter is, which for %C
-		 * can leave sender_keeps_checksum unset and over-read F_SUM. */
-		width = 1;
-		if (*p == '-') {
+		if (*++p == '-')
 			p++;
-			width++;
-		}
-		while (isDigit(p) && width < LOG_FMT_SIZE - 8) {
+		while (isDigit(p))
 			p++;
-			width++;
-		}
-		while (*p == '\'') p++;
 		if (!*p)
 			break;
 		if (*p == esc)
 			return 1;
-		if (*p == '%')	/* %% is a literal '%', not the start of an escape */
-			p++;
 	}
 	return 0;
 }
@@ -861,70 +745,67 @@ int log_format_has(const char *format, char esc)
 /* Log the transfer of a file.  If the code is FCLIENT, the output just goes
 * to stdout.  If it is FLOG, it just goes to the log file.  Otherwise we
 * output to both. */
-void log_item(enum logcode code, struct file_struct *file, int iflags, const char *hlink)
+void log_item(enum logcode code, struct file_struct *file,
+	      struct stats *initial_stats, int iflags, const char *hlink)
 {
 	const char *s_or_r = am_sender ? "send" : "recv";

-	if (code != FLOG && stdout_format && !am_server)
-		log_formatted(FCLIENT, stdout_format, s_or_r, file, NULL, iflags, hlink);
-	if (code != FCLIENT && logfile_format && *logfile_format)
-		log_formatted(FLOG, logfile_format, s_or_r, file, NULL, iflags, hlink);
+	if (code != FLOG && stdout_format && !am_server) {
+		log_formatted(FCLIENT, stdout_format, s_or_r,
+			      file, NULL, initial_stats, iflags, hlink);
+	}
+	if (code != FCLIENT && logfile_format && *logfile_format) {
+		log_formatted(FLOG, logfile_format, s_or_r,
+			      file, NULL, initial_stats, iflags, hlink);
+	}
 }

-void maybe_log_item(struct file_struct *file, int iflags, int itemizing, const char *buf)
+void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
+		    const char *buf)
 {
 	int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
 	int see_item = itemizing && (significant_flags || *buf
-		|| stdout_format_has_i > 1 || (INFO_GTE(NAME, 2) && stdout_format_has_i));
+		|| stdout_format_has_i > 1 || (verbose > 1 && stdout_format_has_i));
 	int local_change = iflags & ITEM_LOCAL_CHANGE && significant_flags;
 	if (am_server) {
 		if (logfile_name && !dry_run && see_item
 		 && (significant_flags || logfile_format_has_i))
-			log_item(FLOG, file, iflags, buf);
+			log_item(FLOG, file, &stats, iflags, buf);
 	} else if (see_item || local_change || *buf
 	    || (S_ISDIR(file->mode) && significant_flags)) {
 		enum logcode code = significant_flags || logfile_format_has_i ? FINFO : FCLIENT;
-		log_item(code, file, iflags, buf);
+		log_item(code, file, &stats, iflags, buf);
 	}
 }

 void log_delete(const char *fname, int mode)
 {
-	static struct file_struct *file = NULL;
+	static struct {
+		union file_extras ex[4]; /* just in case... */
+		struct file_struct file;
+	} x;
 	int len = strlen(fname);
 	const char *fmt;

-	if (!file) {
-		int extra_len = (file_extra_cnt + 2) * EXTRA_LEN;
-		char *bp;
-#if EXTRA_ROUNDING > 0
-		if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
-			extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
-#endif
+	x.file.mode = mode;

-		bp = new_array0(char, FILE_STRUCT_LEN + extra_len + 1);
-		bp += extra_len;
-		file = (struct file_struct *)bp;
-	}
-
-	file->mode = mode;
-
-	if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
+	if (!verbose && !stdout_format)
+		;
+	else if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
 		if (S_ISDIR(mode))
 			len++; /* directories include trailing null */
 		send_msg(MSG_DELETED, fname, len, am_generator);
-	} else if (!INFO_GTE(DEL, 1) && !stdout_format)
-		;
-	else {
+	} else {
 		fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n";
-		log_formatted(FCLIENT, fmt, "del.", file, fname, ITEM_DELETED, NULL);
+		log_formatted(FCLIENT, fmt, "del.", &x.file, fname, &stats,
+			      ITEM_DELETED, NULL);
 	}

 	if (!logfile_name || dry_run || !logfile_format)
 		return;

 	fmt = logfile_format_has_o_or_i ? logfile_format : "deleting %n";
-	log_formatted(FLOG, fmt, "del.", file, fname, ITEM_DELETED, NULL);
+	log_formatted(FLOG, fmt, "del.", &x.file, fname, &stats, ITEM_DELETED, NULL);
 }

 /*
@@ -935,15 +816,12 @@ void log_delete(const char *fname, int mode)
 */
 void log_exit(int code, const char *file, int line)
 {
-	/* The receiving side's stats are split between 2 procs until the
-	 * end of the run, so only the sender can output non-final info. */
-	if (code == 0 || am_sender) {
-		rprintf(FLOG,"sent %s bytes  received %s bytes  total size %s\n",
-			big_num(stats.total_written),
-			big_num(stats.total_read),
-			big_num(stats.total_size));
-	}
-	if (code != 0 && am_server != 2) {
+	if (code == 0) {
+		rprintf(FLOG,"sent %.0f bytes  received %.0f bytes  total size %.0f\n",
+			(double)stats.total_written,
+			(double)stats.total_read,
+			(double)stats.total_size);
+	} else if (am_server != 2) {
 		const char *name;

 		name = rerr_name(code);
@@ -953,10 +831,10 @@ void log_exit(int code, const char *file, int line)
 		/* VANISHED is not an error, only a warning */
 		if (code == RERR_VANISHED) {
 			rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n",
-				name, code, src_file(file), line, who_am_i(), rsync_version());
+				name, code, file, line, who_am_i(), RSYNC_VERSION);
 		} else {
 			rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n",
-				name, code, src_file(file), line, who_am_i(), rsync_version());
+				name, code, file, line, who_am_i(), RSYNC_VERSION);
 		}
 	}
 }
@@ -1,21 +0,0 @@
-dnl AC_HAVE_TYPE(TYPE,INCLUDES)
-AC_DEFUN([AC_HAVE_TYPE], [
-cv=`echo "$1" | sed 'y%./+- %__p__%'`
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL([ac_cv_type_$cv],
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-AC_INCLUDES_DEFAULT
-$2]],
-[[$1 foo;]])],
-[eval "ac_cv_type_$cv=yes"],
-[eval "ac_cv_type_$cv=no"]))dnl
-ac_foo=`eval echo \\$ac_cv_type_$cv`
-AC_MSG_RESULT($ac_foo)
-if test "$ac_foo" = yes; then
-  ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-if false; then
-	AC_CHECK_TYPES($1)
-fi
-  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
-fi
-])
@@ -1,27 +0,0 @@
-AC_DEFUN([AC_HEADER_MAJOR_FIXED],
-[AC_CACHE_CHECK(whether sys/types.h defines makedev,
-		ac_cv_header_sys_types_h_makedev,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <sys/types.h>]],
-				 [[return makedev(0, 0);]])],
-		[if grep sys/sysmacros.h conftest.err >/dev/null; then
-		   ac_cv_header_sys_types_h_makedev=no
-		 else
-		   ac_cv_header_sys_types_h_makedev=yes
-		 fi],
-		[ac_cv_header_sys_types_h_makedev=no])
-])
-
-if test $ac_cv_header_sys_types_h_makedev = no; then
-AC_CHECK_HEADER(sys/mkdev.h,
-		[AC_DEFINE(MAJOR_IN_MKDEV, 1,
-			   [Define to 1 if `major', `minor', and `makedev' are
-			    declared in <mkdev.h>.])])
-
-  if test $ac_cv_header_sys_mkdev_h = no; then
-    AC_CHECK_HEADER(sys/sysmacros.h,
-		    [AC_DEFINE(MAJOR_IN_SYSMACROS, 1,
-			       [Define to 1 if `major', `minor', and `makedev'
-				are declared in <sysmacros.h>.])])
-  fi
-fi
-])
Author	SHA1	Message	Date
Wayne Davison	7221063019	Preparing for release of 3.0.5	2008-12-28 18:02:17 -08:00
Wayne Davison	b64ae8b3b4	Avoid a hang when using at least 3 --verbose options on a transfer with a client sender (which includes local copying).	2008-12-28 17:51:36 -08:00
Wayne Davison	9938bad34a	Allow opendir() in send_directory() to fail with ENOENT.	2008-12-27 11:22:02 -08:00
Wayne Davison	1ff3e90507	Make it clearer which configure files changed.	2008-11-15 15:32:02 -08:00
Wayne Davison	b292021e45	Mention a few NEWS items that hadn't been mentioned yet.	2008-11-15 15:25:30 -08:00
Wayne Davison	13e40ca0c6	Preparing for release of 3.0.5pre2	2008-11-15 14:55:30 -08:00
Wayne Davison	8e85627fb3	An ftruncate() failure should result in FERROR_XFER.	2008-11-15 14:49:28 -08:00
Wayne Davison	d552250fbb	Tweaked the month guess in OLDNEWS.	2008-11-15 14:38:14 -08:00
Wayne Davison	5436b64557	Change clean_fname() to keep "//" at the start for cygwin.	2008-11-15 14:17:49 -08:00
Wayne Davison	b325dd0326	Change some size_t vars to ints.	2008-11-15 13:29:03 -08:00
Wayne Davison	49818a8378	Make sparse_seek an OFF_T (pointed out by Pedro Valasco).	2008-11-11 18:06:50 -08:00
Wayne Davison	af03a7049c	A "make reconfigure" doesn't stop if configure changes.	2008-11-11 15:55:53 -08:00
Wayne Davison	e401b30403	Mention Matt's -K --delete fix.	2008-11-10 07:48:00 -08:00
Matt McCutchen	e512826786	Add flist_find_ignore_dirness() and change delete_in_dir() to use it. This fixes an issue with -K noticed by eric casteleijn, avoids some inconsistent itemizing when a file/dir is replaced by a dir/file, and removes a now-obsolete chunk of code from make_file().	2008-11-10 07:46:41 -08:00
Wayne Davison	ccdc2efd67	Mention the fix for --files-from dot/./paths.	2008-11-09 21:48:21 -08:00
Wayne Davison	b8a1fd6404	Fixed the use of a dot-dir path (foo/./bar) inside of a files-from file.	2008-11-09 21:39:08 -08:00
Wayne Davison	3082dffbe2	Fixed a bunch of "warn_unused_result" compiler warnings.	2008-11-09 18:55:14 -08:00
Wayne Davison	42130f9cb0	Mention hang fix in the NEWS.	2008-11-09 18:07:30 -08:00
Wayne Davison	c6c339cd18	Avoid a potential hang when --remove-*-files is active.	2008-11-09 18:02:11 -08:00
Matt McCutchen	6767ca617b	The protect filter automatically added with --backup is not perishable (see `f41152d393`), so remove the inaccurate "p" from the man page. Noticed by Jacob Balazer: http://lists.samba.org/archive/rsync/2008-November/022022.html	2008-11-02 20:53:01 -08:00
Wayne Davison	7d9e30d383	Mention the getnameinfo() fix in the NEWS.	2008-10-25 09:47:08 -07:00
Wayne Davison	3f81ad6060	Mention rsync's definition of client and server.	2008-10-25 09:44:21 -07:00
Wayne Davison	723e9f856d	Fixed our supplied getnameinfo()'s ability to do a reverse lookup, as reported in bug 5851.	2008-10-25 08:39:41 -07:00
Wayne Davison	9189e41f6e	Added another file-list filter to handle odd-ball systems that don't seem to size their sprintf() fields correctly.	2008-10-14 07:27:56 -07:00
Wayne Davison	6f6f9d1020	Preparing for release of 3.0.5pre1	2008-10-11 11:41:05 -07:00
Wayne Davison	a76ba8b425	Mention the latest NEWS.	2008-10-11 11:40:40 -07:00
Wayne Davison	b8fd528794	Fixed a glitch when using -s with a remote-shell daemon.	2008-10-11 11:14:43 -07:00
Wayne Davison	0ea5d30479	Don't lookup address "0.0.0.0" when we're a remote-shell daemon. Gets rid of a DNS delay waiting for a lookup failure.	2008-10-11 11:13:43 -07:00
Wayne Davison	cf1b292201	Fixed send_protected_args() to send "." in place of an empty arg.	2008-10-11 10:16:47 -07:00
Wayne Davison	f3721ed133	Added a fully atomic update if the user has setup a symlink to a -1 or -2 directory. A few other minor improvements.	2008-10-11 09:29:23 -07:00
Wayne Davison	b1220d62f4	Fix the error message on one of the rename operations.	2008-10-10 06:55:21 -07:00
Wayne Davison	5df89a1a44	Remove bogus "non-empty" qualifier in '*' discussion.	2008-09-26 21:47:53 -07:00
Wayne Davison	d47ac91209	Properly ignore source args on a --read-batch command.	2008-09-26 21:34:40 -07:00
Wayne Davison	7c573428a9	Fixed skipping of unneeded updates in a batch file when incremental recursion is active. Added a test for this. Made batch-mode handle redos properly (and without hanging).	2008-09-26 21:32:43 -07:00
Wayne Davison	f7e65c7b61	Moved the flist_ndx_{push,pop}() routines from io.c into util.c.	2008-09-26 21:21:52 -07:00
Wayne Davison	fe62d30de8	Fix the %P logfile escape inside a chroot.	2008-09-26 21:19:51 -07:00
Wayne Davison	494895fb4b	Initialize xattr data in a couple spots in the hlink code, which avoids a crash when the xattr pointer's memory happens to start out non-zero. Also fixed the itemizing of an alt-dest file's xattrs when hard-linking.	2008-09-26 21:10:58 -07:00
Wayne Davison	ac68345a34	Don't send a bogus "-" option to an older server if there were no short options specified.	2008-09-26 21:09:41 -07:00
Wayne Davison	6a9ade2ded	Beginning work on a 3.0.5 release.	2008-09-26 21:07:56 -07:00
Wayne Davison	d596d389fe	Preparing for release of 3.0.4	2008-09-06 09:32:26 -07:00
Wayne Davison	bc2337717e	A few more improvements and a mention of the latest fix.	2008-09-06 08:03:52 -07:00
Wayne Davison	3df40f044a	Changed some "rsync" commands into proper "$RSYNC" commands.	2008-09-03 12:14:13 -07:00
Wayne Davison	d11a5b80c1	Made human_num() and human_dnum() able to output negative numbers.	2008-09-01 13:25:41 -07:00
Wayne Davison	deea1f70bd	Got rid of the check_for_io_err code, as it could cause a hang. The io_error issue will be fixed in a better way in 3.1.0.	2008-08-31 09:51:29 -07:00
Wayne Davison	a91e678324	Some minor improvements to the flushing code to try to make it even more solid.	2008-08-24 13:39:44 -07:00
Wayne Davison	25a22d8501	Make the !flist_eof assumption explicit before the check_for_io_err code calls wait_for_receiver().	2008-08-24 12:33:22 -07:00
Wayne Davison	fac9e234ae	Added /support/savetransfer to .gitignore.	2008-08-17 09:28:06 -07:00
Wayne Davison	f3d87ee972	An improved RERR_PARTIAL message.	2008-08-17 09:25:34 -07:00
Wayne Davison	9bed85542c	Changed flist_for_ndx() to optionally die with an error if the index isn't found.	2008-08-14 07:32:18 -07:00
Wayne Davison	5b979530a7	Made an error of readlink_stat() use the right function name.	2008-08-10 07:31:45 -07:00
Wayne Davison	7ec8baaa7e	Make sure that the hlink node->data allocation doesn't fail.	2008-08-08 07:47:31 -07:00
Wayne Davison	8c2c008984	Improved a couple NEWS items.	2008-08-05 18:43:51 -07:00
Wayne Davison	719a29e1cf	Preparing for release of 3.0.4pre2	2008-08-02 14:06:31 -07:00
Wayne Davison	4a95d61251	Tweaked the symlink iconv buffer size and fixed a comment.	2008-08-02 13:45:15 -07:00
Wayne Davison	fc088e30c8	When using --iconv, if a server-side receiver can't convert a filename, it now outputs the name back to the client without mangling the charset.	2008-08-02 10:25:17 -07:00
Wayne Davison	aef51b4c68	Refer to the symlink's contents as "symlink data", not "symlink name".	2008-08-02 10:18:10 -07:00
Wayne Davison	7790ee3684	Added logic to the receiving side to ensure that the --delete-during code will not delete in a directory prior to receiving an I/O error for that directory (or not receiving it, as the case may be).	2008-08-02 09:03:49 -07:00
Wayne Davison	ed12c8eb21	Skip new symlink conversion step if the remote rsync is not new enough to do symlink content conversions.	2008-08-02 07:04:54 -07:00
Wayne Davison	91dd3d0d48	The --iconv option now converts the content of a symlink too.	2008-08-01 19:20:41 -07:00
Wayne Davison	95d1d2a9a4	Fixed a problem with checking for the '.' dir in the first file list that is transferred. This fixes a glitch where a failed --iconv conversion on the receiving side could prevent deletions from happening in the root-dir of the transfer.	2008-08-01 19:00:21 -07:00
Wayne Davison	a808346dbe	Fixed a couple minor problems in util.c: - Make sure that handle_partial_dir() never returns a truncated fname. - Make robust_rename() return that it failed to do a cross-device copy if the partial-dir could not be created.	2008-08-01 18:00:18 -07:00
Wayne Davison	fa181223d8	Properly handle a failure to create a partial directory, which is especially important for --delay-updates, particularly when --remove-source-files was also specified.	2008-08-01 18:00:09 -07:00
Wayne Davison	9ed569486f	Output an FERROR* for a general io_error, and an FWARNING for other io_error flags.	2008-07-31 07:57:55 -07:00
Wayne Davison	2fa069d85f	Mention a missing sender-side hash improvment that went out in 3.0.0.	2008-07-30 08:33:35 -07:00
Wayne Davison	a25aed50e6	Make hard-linking work when a device has an st_dev of 0.	2008-07-29 18:08:51 -07:00
Wayne Davison	302e4346c2	Mention some mount options that can interfere with --link-dest.	2008-07-28 18:24:25 -07:00
Wayne Davison	8e5eafccdf	Back-porting some manpage improvements.	2008-07-28 17:07:38 -07:00
Wayne Davison	e88b92bade	Preparing for release of 3.0.4pre1	2008-07-24 17:03:26 -07:00
Wayne Davison	f8722dba56	Fixed the --fake-super test in the xattrs testsuite when there are root-level xattrs on the files (e.g. selinux values).	2008-07-24 07:57:57 -07:00
Wayne Davison	ee03cb99d9	Fixed the timeout/flush loop-check logic to work properly with incremental recursion.	2008-07-23 23:37:11 -07:00
Wayne Davison	92d706a274	Don't interrupt the make if a generated build file didn't really change.	2008-07-23 23:28:57 -07:00
Wayne Davison	581c830c56	A couple xattr fixes for --fake-super.	2008-07-23 23:12:39 -07:00
Wayne Davison	9e58ef45f3	If the user specifies --protocol=29, rsync will avoid sending an -e option to the server (which is only useful for protocols 30 and above anyway). This gives the user an easy way to talk to a restricted server that has overly restrictive option-checking.	2008-07-23 23:09:15 -07:00
Wayne Davison	05bd05a7a1	Pass --branch option to patch-update script.	2008-07-23 17:13:29 -07:00
Wayne Davison	89b6b4ce4b	We only need to deal with local patch branches now.	2008-07-23 14:32:58 -07:00
Wayne Davison	68cdc3b791	Fixed a potential alignment issue in the IRIX ACL code when allocating the initial struct acl object. Also, cast mallocs to avoid warnings.	2008-07-22 21:35:21 -07:00
Wayne Davison	209371b891	Fixed a bug in match_hard_links() where an empty directory would try to allocate 0 bytes of memory (which can fail on some OSes).	2008-07-22 21:34:20 -07:00
Wayne Davison	6fd2662982	Allow a release from a non-master branch.	2008-07-22 09:11:34 -07:00
Wayne Davison	1fdf0302c0	Start the 3.0.4 branch.	2008-07-22 09:11:22 -07:00