Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #10498: Stopping slapd fails if pid file is empty #1503

Conversation

peckpeck
Copy link
Member

@peckpeck peckpeck commented Feb 9, 2018

@@ -509,6 +509,11 @@ stop_slapd() {
return 1
else
PID=`cat $SLAPD_PID_FILE`
if [ ! -e /proc/$PID ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if PID is empty, /proc/ will exist?

@amousset
Copy link
Member

amousset commented Feb 9, 2018

I looks like you mixed two changes

@peckpeck peckpeck force-pushed the bug_10498/stopping_slapd_fails_if_pid_file_is_empty branch from b73a69f to 3ae8702 Compare February 9, 2018 15:46
@peckpeck
Copy link
Member Author

peckpeck commented Feb 9, 2018

Commit modified

@peckpeck peckpeck force-pushed the bug_10498/stopping_slapd_fails_if_pid_file_is_empty branch from 3ae8702 to feb3ea6 Compare February 9, 2018 15:47
@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder-packages/pull/1503
-- Your faithful QA

@peckpeck
Copy link
Member Author

peckpeck commented Feb 9, 2018

OK, merging this PR

@peckpeck peckpeck merged commit feb3ea6 into Normation:branches/rudder/4.1 Feb 9, 2018
@peckpeck peckpeck deleted the bug_10498/stopping_slapd_fails_if_pid_file_is_empty branch July 13, 2020 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants