Expand available shells to be per-user type

virtualmin · Dec 6, 2023 · a3aaaac · a3aaaac
1 parent b663883
commit a3aaaac
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/virtual-server-lib-funcs.pl b/virtual-server-lib-funcs.pl
@@ -17974,10 +17974,15 @@ sub list_available_shells
                 $classes{'ssh'}++;
 		$defclass = 'ssh';
 		}
-	# Only the default or first of each class are available
+	# Only the default or first of each class are available for each user
 	foreach my $c (grep { $_ ne $defclass } keys %classes) {
-		local ($firstclass) = grep { $_->{'id'} eq $c } @rv;
-		$firstclass->{'avail'} = 1;
+		foreach my $u ('owner', 'mailbox') {
+			my ($firstclass) = grep { $_->{'id'} eq $c &&
+						  $_->{$u} } @rv;
+			if ($firstclass) {
+				$firstclass->{'avail'} = 1;
+				}
+			}
 		}
 	}
 $list_available_shells_cache{$mail} = \@rv;