From 019cc10b7922c9f82c8e428a5424cfb8abede2bb Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 5 Mar 2026 20:41:45 -0800
Subject: [PATCH] Use formal function parameters

---
 useradmin/user-lib.pl | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/useradmin/user-lib.pl b/useradmin/user-lib.pl
index 27e9f0337..c039f6749 100755
--- a/useradmin/user-lib.pl
+++ b/useradmin/user-lib.pl
@@ -1439,33 +1439,34 @@ parent dirs. The parameters are :
 =cut
 sub auto_home_dir
 {
-local $pfx = $_[0] eq "/" ? "/" : $_[0]."/";
+my ($base, $user, $group) = @_;
+my $pfx = $base eq "/" ? "/" : $base."/";
 if ($config{'home_style'} == 0) {
-	return $pfx.$_[1];
+	return $pfx.$user;
 	}
 elsif ($config{'home_style'} == 1) {
-	&mkdir_if_needed($pfx.substr($_[1], 0, 1));
-	return $pfx.substr($_[1], 0, 1)."/".$_[1];
+	&mkdir_if_needed($pfx.substr($user, 0, 1));
+	return $pfx.substr($user, 0, 1)."/".$user;
 	}
 elsif ($config{'home_style'} == 2) {
-	&mkdir_if_needed($pfx.substr($_[1], 0, 1));
-	&mkdir_if_needed($pfx.substr($_[1], 0, 1)."/".
-			 substr($_[1], 0, 2));
-	return $pfx.substr($_[1], 0, 1)."/".
-	       substr($_[1], 0, 2)."/".$_[1];
+	&mkdir_if_needed($pfx.substr($user, 0, 1));
+	&mkdir_if_needed($pfx.substr($user, 0, 1)."/".
+			 substr($user, 0, 2));
+	return $pfx.substr($user, 0, 1)."/".
+	       substr($user, 0, 2)."/".$user;
 	}
 elsif ($config{'home_style'} == 3) {
-	&mkdir_if_needed($pfx.substr($_[1], 0, 1));
-	&mkdir_if_needed($pfx.substr($_[1], 0, 1)."/".
-			 substr($_[1], 1, 1));
-	return $pfx.substr($_[1], 0, 1)."/".
-	       substr($_[1], 1, 1)."/".$_[1];
+	&mkdir_if_needed($pfx.substr($user, 0, 1));
+	&mkdir_if_needed($pfx.substr($user, 0, 1)."/".
+			 substr($user, 1, 1));
+	return $pfx.substr($user, 0, 1)."/".
+	       substr($user, 1, 1)."/".$user;
 	}
 elsif ($config{'home_style'} == 4) {
-	return $_[0];
+	return $base;
 	}
 elsif ($config{'home_style'} == 5) {
-	return $pfx.$_[2]."/".$_[1];
+	return $pfx.$group."/".$user;
 	}
 }