From f042a9a2227128224d42ad5b3d11b3f65ad3ff77 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Jan 2025 16:46:37 +0100
Subject: [PATCH] chmod: remove the option from configure_symlink_and_recursion

---
 src/uu/chmod/src/chmod.rs            | 2 +-
 src/uucore/src/lib/features/perms.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs
index bde2ae773..d2eb22ce6 100644
--- a/src/uu/chmod/src/chmod.rs
+++ b/src/uu/chmod/src/chmod.rs
@@ -149,7 +149,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         fmode,
         cmode,
         traverse_symlinks,
-        dereference: dereference.unwrap_or(true),
+        dereference,
     };
 
     chmoder.chmod(&files)
diff --git a/src/uucore/src/lib/features/perms.rs b/src/uucore/src/lib/features/perms.rs
index 214335820..62e7d56ed 100644
--- a/src/uucore/src/lib/features/perms.rs
+++ b/src/uucore/src/lib/features/perms.rs
@@ -526,7 +526,7 @@ type GidUidFilterOwnerParser = fn(&ArgMatches) -> UResult<GidUidOwnerFilter>;
 /// Returns the updated `dereference` and `traverse_symlinks` values.
 pub fn configure_symlink_and_recursion(
     matches: &ArgMatches,
-) -> Result<(bool, Option<bool>, TraverseSymlinks), Box<dyn crate::error::UError>> {
+) -> Result<(bool, bool, TraverseSymlinks), Box<dyn crate::error::UError>> {
     let mut dereference = if matches.get_flag(options::dereference::DEREFERENCE) {
         Some(true) // Follow symlinks
     } else if matches.get_flag(options::dereference::NO_DEREFERENCE) {
@@ -558,7 +558,7 @@ pub fn configure_symlink_and_recursion(
         traverse_symlinks = TraverseSymlinks::None;
     }
 
-    Ok((recursive, dereference, traverse_symlinks))
+    Ok((recursive, dereference.unwrap_or(true), traverse_symlinks))
 }
 
 /// Base implementation for `chgrp` and `chown`.
@@ -646,7 +646,7 @@ pub fn chown_base(
             level: verbosity_level,
         },
         recursive,
-        dereference: dereference.unwrap_or(true),
+        dereference,
         preserve_root,
         files,
         filter,