Blob Blame History Raw
commit 1f0ee8705d108b628e59746e851f51fd1599190c
Author: Nathan Scott <nathans@redhat.com>
Date:   Wed Jul 20 11:47:30 2016 +1000

    pmda ds389log: use dirsrv as default user account
    
    In all current Fedora versions and since RHEL7.3 the default
    user for 389-ds is dirsrv instead of nobody.
    
    Update defaults for pcp-pmda-ds389log to reflect this change.
    The configuration file can still be used to explicitly set an
    alternative user if needed.
    
    Resolves Red Hat BZ #1357607.

diff --git a/qa/960 b/qa/960
index 845da39..5c9f269 100755
--- a/qa/960
+++ b/qa/960
@@ -18,6 +18,7 @@ echo "QA output created by $seq"
 which logconv.pl >/dev/null 2>&1 || _notrun "No logconv.pl script installed"
 $sudo ls /var/log/dirsrv/slapd-*/access 2>&1 >/dev/null || \
     _notrun "No ds389 directory log files accessible"
+id dirsrv >/dev/null 2>&1 || _notrun "No dirsrv (default) account installed"
 
 status=1	# failure is the default!
 $sudo rm -rf $tmp.* $seq.full
diff --git a/src/pmdas/ds389log/pmdads389log.pl b/src/pmdas/ds389log/pmdads389log.pl
index a7e7c32..fd063db 100644
--- a/src/pmdas/ds389log/pmdads389log.pl
+++ b/src/pmdas/ds389log/pmdads389log.pl
@@ -25,7 +25,7 @@ our $lc_opts = '-D /dev/shm -s all';
 our $lc_ival = 30; # minimal query interval in seconds, must be >= 30
 our $ds_alog = ''; # empty - guess; ok if only one DS instance in use
 our $ds_logd = '/var/log/dirsrv';
-our $ds_user = 'nobody'; # empty - use root
+our $ds_user = 'dirsrv'; # empty - use root
 
 # Configuration files for overriding the above settings
 for my $file (pmda_config('PCP_PMDAS_DIR') . '/ds389log/ds389log.conf', './ds389log.conf') {