diff options
| author | crees <crees@FreeBSD.org> | 2011-07-05 03:05:05 +0800 |
|---|---|---|
| committer | crees <crees@FreeBSD.org> | 2011-07-05 03:05:05 +0800 |
| commit | 6e8977f59411d0089f9b71474c1e4e82e6ccbac9 (patch) | |
| tree | f35e44e83d68eaac74bc4dfa7f1706595bb53286 /dns | |
| parent | d38baae4120b1a129a07e5043f029ae8758f272c (diff) | |
| download | freebsd-ports-gnome-6e8977f59411d0089f9b71474c1e4e82e6ccbac9.tar.gz freebsd-ports-gnome-6e8977f59411d0089f9b71474c1e4e82e6ccbac9.tar.zst freebsd-ports-gnome-6e8977f59411d0089f9b71474c1e4e82e6ccbac9.zip | |
- Use USERS and GROUPS
PR: ports/157601
Approved by: rene (mentor, implicit)
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/rbldnsd/Makefile | 6 | ||||
| -rw-r--r-- | dns/rbldnsd/pkg-install | 30 |
2 files changed, 2 insertions, 34 deletions
diff --git a/dns/rbldnsd/Makefile b/dns/rbldnsd/Makefile index 82d543ac20e9..2c5d452d1410 100644 --- a/dns/rbldnsd/Makefile +++ b/dns/rbldnsd/Makefile @@ -32,13 +32,11 @@ MAN8= rbldnsd.8 HAS_CONFIGURE= yes USE_RC_SUBR= rbldnsd +USERS= rbldns +GROUPS= ${USERS} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message -pre-install: - @${ECHO} "==> Creating custom user to run rbldnsd..." - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - do-install: @if [ ! -d ${ROOTDIR} ]; then \ ${MKDIR} ${ROOTDIR}; \ diff --git a/dns/rbldnsd/pkg-install b/dns/rbldnsd/pkg-install deleted file mode 100644 index a2a7943481e1..000000000000 --- a/dns/rbldnsd/pkg-install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -if [ "$2" != "PRE-INSTALL" ]; then - exit 0 -fi - -RBLDNSUSER=${RBLDNSUSER:-rbldns} -RBLDNSGROUP=${RBLDNSGROUP:-rbldns} - -if ! pw groupshow "$RBLDNSGROUP" 2>/dev/null 1>&2; then - if pw groupadd $RBLDNSGROUP; then - echo "=> Added group \"$RBLDNSGROUP\"." - else - echo "=> Adding group \"$RBLDNSGROUP\" failed..." - exit 1 - fi -fi - -if ! pw usershow "$RBLDNSUSER" 2>/dev/null 1>&2; then - if pw useradd $RBLDNSUSER -g $RBLDNSGROUP -h - \ - -s "/usr/sbin/nologin" -d "/nonexistent" \ - -c "rbldnsd pseudo-user"; \ - then - echo "=> Added user \"$RBLDNSUSER\"." - else - echo "=> Adding user \"$RBLDNSUSER\" failed..." - exit 1 - fi -fi -exit 0 |