aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/qmail/pkg-install42
1 files changed, 16 insertions, 26 deletions
diff --git a/mail/qmail/pkg-install b/mail/qmail/pkg-install
index fad5b011b617..ffa3610cfbfd 100644
--- a/mail/qmail/pkg-install
+++ b/mail/qmail/pkg-install
@@ -67,32 +67,6 @@ if (${?PACKAGE_BUILDING}) then
set doguid = 1;
endif
-if ($doguid) then
- set k = 1;
- foreach group ($groups) {
- set chkgid = (`$pw groupshow $group | $sed -e "s/:/ /"`);
- if ($chkgid[3] != $gids[$k]) then
- echo "Group '$group' should have gid '$gids[$k]'";
- exit 1;
- endif
-
- @ k = $k + 1;
- }
-
- set k = 1;
- foreach user ($users) {
- set chkuid = (`$pw usershow $user | $sed -e "s/:/ /"`);
- if ($chkuid[3] != $uids[$k]) then
- echo "User '$user' should have uid '$uids[$k]'";
- exit 1;
- endif
-
- @ k = $k + 1;
- }
-
- exit 0;
-endif
-
set k = 1;
foreach group ($groups)
$pw groupshow $group >& $null;
@@ -106,6 +80,14 @@ foreach group ($groups)
endif
endif
+ if ($doguid) then
+ set chkgid = (`$pw groupshow $group | $sed -e "s/:/ /g"`);
+ if ($chkgid[3] != $gids[$k]) then
+ echo "Group '$group' should have gid '$gids[$k]'";
+ exit 1;
+ endif
+ endif
+
@ k = $k + 1;
end
@@ -128,6 +110,14 @@ foreach user ($users)
endif
endif
+ if ($doguid) then
+ set chkuid = (`$pw usershow $user | $sed -e "s/:/ /g"`);
+ if ($chkuid[3] != $uids[$k]) then
+ echo "User '$user' should have uid '$uids[$k]'";
+ exit 1;
+ endif
+ endif
+
@ k = $k + 1;
end