jengelh/openldap2
SHA256
1
0
Fork 2
forked from pool/openldap2
Code Pull Requests Activity

Accepting request 826780 from home:kukuk:container

Browse Source 
- Remove remaining rc.status usage in start script

OBS-URL: https://build.opensuse.org/request/show/826780
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=267
This commit is contained in:
Michael Ströder 2020-08-15 06:44:31 +00:00 committed by Git OBS Bridge
parent 7ec5ff3033
commit 2e24332235
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openldap2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Aug 15 06:36:43 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
- Remove remaining rc.status usage in start script
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 12 06:16:42 UTC 2020 - Michael Ströder <michael@stroeder.com> Wed Aug 12 06:16:42 UTC 2020 - Michael Ströder <michael@stroeder.com>

18
start
View File

@ -34,20 +34,6 @@ SLAPD_PID_DIR="/var/run/slapd/"
test -x $SLAPD_BIN || exit 5 test -x $SLAPD_BIN || exit 5
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
# rc_status -v ditto but be verbose in local rc status
# rc_status -v -r ditto and clear the local rc status
# rc_failed set local and overall rc status to failed
# rc_failed <num> set local and overall rc status to <num><num>
# rc_reset clear local rc status (overall remains)
# rc_exit exit appropriate to overall rc status
. /etc/rc.status
# First reset status of this service
rc_reset
function init_ldap_listener_urls(){ function init_ldap_listener_urls(){
case "$OPENLDAP_START_LDAP" in case "$OPENLDAP_START_LDAP" in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
@ -143,14 +129,12 @@ GROUP_CMD=""
if [ -f /etc/openldap/UPDATE_NEEDED ]; then if [ -f /etc/openldap/UPDATE_NEEDED ]; then
rc_failed 6
echo " The configuration of your LDAP server needs to be updated." echo " The configuration of your LDAP server needs to be updated."
echo " Please see /usr/share/doc/packages/openldap2/README.update" echo " Please see /usr/share/doc/packages/openldap2/README.update"
echo " for details." echo " for details."
echo " After the update please remove the file:" echo " After the update please remove the file:"
echo " /etc/openldap/UPDATE_NEEDED" echo " /etc/openldap/UPDATE_NEEDED"
rc_status -v exit 6
exit
fi fi
# chown backend directories if OPENLDAP_CHOWN_DIRS ist set # chown backend directories if OPENLDAP_CHOWN_DIRS ist set
if [ "$(echo "$OPENLDAP_CHOWN_DIRS" | tr 'A-Z' 'a-z')" = "yes" ]; then if [ "$(echo "$OPENLDAP_CHOWN_DIRS" | tr 'A-Z' 'a-z')" = "yes" ]; then