From 026ebc1dee83c42ece2eb7465ef31ba77ccb01b2 Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Wed, 31 Mar 2004 16:56:31 +0000 Subject: [PATCH] prefer /usr/sbin/nologin than /sbin/nologin when creating user cyrus. Requested by: nork --- mail/cyrus-imapd/pkg-deinstall | 4 +++- mail/cyrus-imapd2/pkg-deinstall | 4 +++- mail/cyrus-imapd22/pkg-deinstall | 4 +++- mail/cyrus-imapd23/pkg-deinstall | 4 +++- mail/cyrus-imapd24/pkg-deinstall | 4 +++- security/cyrus-sasl2/pkg-install | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mail/cyrus-imapd/pkg-deinstall b/mail/cyrus-imapd/pkg-deinstall index 1dbd7611e293..9604f2773537 100644 --- a/mail/cyrus-imapd/pkg-deinstall +++ b/mail/cyrus-imapd/pkg-deinstall @@ -42,7 +42,9 @@ cyrus_conf() { modify_cyrus_user() { USER=cyrus PW=/usr/sbin/pw - if [ -x /sbin/nologin ]; then + if [ -x /usr/sbin/nologin ]; then + shell=/usr/sbin/nologin + elif [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent diff --git a/mail/cyrus-imapd2/pkg-deinstall b/mail/cyrus-imapd2/pkg-deinstall index 8bb9e0f75812..6baee3e9c8e0 100644 --- a/mail/cyrus-imapd2/pkg-deinstall +++ b/mail/cyrus-imapd2/pkg-deinstall @@ -32,7 +32,9 @@ checkfile() { modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw - if [ -x /sbin/nologin ]; then + if [ -x /usr/sbin/nologin ]; then + shell=/usr/sbin/nologin + elif [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent diff --git a/mail/cyrus-imapd22/pkg-deinstall b/mail/cyrus-imapd22/pkg-deinstall index 8bb9e0f75812..6baee3e9c8e0 100644 --- a/mail/cyrus-imapd22/pkg-deinstall +++ b/mail/cyrus-imapd22/pkg-deinstall @@ -32,7 +32,9 @@ checkfile() { modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw - if [ -x /sbin/nologin ]; then + if [ -x /usr/sbin/nologin ]; then + shell=/usr/sbin/nologin + elif [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/pkg-deinstall index 8bb9e0f75812..6baee3e9c8e0 100644 --- a/mail/cyrus-imapd23/pkg-deinstall +++ b/mail/cyrus-imapd23/pkg-deinstall @@ -32,7 +32,9 @@ checkfile() { modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw - if [ -x /sbin/nologin ]; then + if [ -x /usr/sbin/nologin ]; then + shell=/usr/sbin/nologin + elif [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall index 8bb9e0f75812..6baee3e9c8e0 100644 --- a/mail/cyrus-imapd24/pkg-deinstall +++ b/mail/cyrus-imapd24/pkg-deinstall @@ -32,7 +32,9 @@ checkfile() { modify_cyrus_user() { USER=${CYRUS_USER} PW=/usr/sbin/pw - if [ -x /sbin/nologin ]; then + if [ -x /usr/sbin/nologin ]; then + shell=/usr/sbin/nologin + elif [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent diff --git a/security/cyrus-sasl2/pkg-install b/security/cyrus-sasl2/pkg-install index 939107967172..ae250992f24d 100644 --- a/security/cyrus-sasl2/pkg-install +++ b/security/cyrus-sasl2/pkg-install @@ -25,7 +25,9 @@ create_user() { GROUP=${CYRUS_GROUP} PW=/usr/sbin/pw - if [ -x /sbin/nologin ]; then + if [ -x /usr/sbin/nologin ]; then + shell=/usr/sbin/nologin + elif [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent