diff options
| author | Sheldon Hearn <sheldonh@FreeBSD.org> | 2001-12-29 19:57:26 +0000 |
|---|---|---|
| committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 2001-12-29 19:57:26 +0000 |
| commit | 60b3ec4653d5008a9d9ebea83354bee5f6701f09 (patch) | |
| tree | 961eaf72f039078218b5fc0f0cd1e6b62e0509fa | |
| parent | Update to 1.3.11. (diff) | |
Exim 4 does not require numeric values for the compile-time constants
EXIM_USER and EXIM_GROUP. Don't force numeric values down the throats
of operators who, for some reason, have different numeric IDs for
user mailnull and group mail.
Notes
Notes:
svn path=/head/; revision=52371
| -rw-r--r-- | mail/exim-devel/pkg-install | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mail/exim-devel/pkg-install b/mail/exim-devel/pkg-install index 69539a8c560f..40ad765f2fcf 100644 --- a/mail/exim-devel/pkg-install +++ b/mail/exim-devel/pkg-install @@ -13,19 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local} -uid=26 -gid=6 user=mailnull group=mail if [ "$2" = "PRE-INSTALL" ]; then - # uid=26(mailnull) gid=26(mailnull) groups=26(mailnull) - if ! /usr/bin/id ${uid} | /usr/bin/grep -q "uid=${uid}(${user})"; then - echo "Exim requires user ${user} (UID ${uid}). Please update your system." 1>&2 + if ! /usr/bin/id ${user} > /dev/null; then + echo "Exim requires user ${user}. Please update your system." 1>&2 exit 1 fi - if ! /usr/bin/grep -q "^${group}:[^:]*:${gid}:" < /etc/group; then - echo "Exim requires group ${group} (GID ${gid}). Please update your system." 1>&2 + if ! /usr/bin/grep -q "^${group}:" < /etc/group; then + echo "Exim requires group ${group}. Please update your system." 1>&2 exit 1 fi fi |