Skip to content

Commit 712de8d

Browse files
authored
Merge pull request hestiacp#2848 from jaapmarcus/fix/2771-improve-output
2771 [Bug] Correct message to show if subdomains are disabled across multiple Users
2 parents 5de9f1a + 3c691f4 commit 712de8d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

func/domain.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -988,16 +988,16 @@ is_base_domain_owner(){
988988
parse_object_kv_list "$web"
989989
if [ -z "$ALLOW_USERS" ] || [ "$ALLOW_USERS" != "yes" ]; then
990990
# Don't care if $basedomain all ready exists only if the owner is of the base domain is the current user
991-
is_domain_new "" $basedomain;
991+
check=$(is_domain_new "" $basedomain)
992992
if [ $? -ne 0 ]; then
993-
echo "Error: $basedomain belongs to a different user";
993+
echo "Error: Unable to add $object. $basedomain belongs to a different user";
994994
exit 4;
995995
fi
996996
fi
997997
else
998-
is_domain_new "" "$basedomain"
998+
check=$(is_domain_new "" "$basedomain")
999999
if [ $? -ne 0 ]; then
1000-
echo "Error: $basedomain belongs to a different user";
1000+
echo "Error: Unable to add $object. $basedomain belongs to a different user";
10011001
exit 4;
10021002
fi
10031003
fi

0 commit comments

Comments
 (0)