Attachment 5905 Details for Bug 34798

[patch] Don't abort on slapd-not-running

34798_join-status.diff (text/plain), 2.11 KB, created by Philipp Hahn on 2014-05-09 15:54 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2014-05-09 15:54 CEST

Size: 2.11 KB

patch

obsolete

>diff --git a/branches/ucs-3.2/ucs-3.2-2/management/univention-join/check_join_status.sh b/branches/ucs-3.2/ucs-3.2-2/management/univention-join/check_join_status.sh
>index de5230c..b026725 100755
>--- a/branches/ucs-3.2/ucs-3.2-2/management/univention-join/check_join_status.sh
>+++ b/branches/ucs-3.2/ucs-3.2-2/management/univention-join/check_join_status.sh
>@@ -36,7 +36,6 @@ log_error () { # Log error message and exit
> 	local message="Error: $@"
> 	echo $message
> 	echo $message >>"$LOG_FILE"
>-	exit 1
> }
> log_warn () { # Log warning message
> 	local message="Warning: $@"
>@@ -47,29 +46,26 @@ log_warn () { # Log warning message
> echo "Start $0 at $(date)" >>"$LOG_FILE"
> eval "$(univention-config-registry shell)"
> 
>-if [ ! -e /etc/machine.secret ]; then
>-	log_error "/etc/machine.secret not found"
>-fi
>-
>-if ! ldapsearch -x -h "$ldap_master" -p "$ldap_master_port" -D "$ldap_hostdn" -w "$(</etc/machine.secret)" -b "$ldap_base" -s base >>"$LOG_FILE" 2>&1
>-then
>-	log_error "ldapsearch -x failed"
>-fi
>-
>-
>-if ! ldapsearch -x -ZZ -h "$ldap_master" -p "$ldap_master_port" -D "$ldap_hostdn" -w "$(</etc/machine.secret)" -b "$ldap_base" -s base >>"$LOG_FILE" 2>&1
>-then
>-	log_error "ldapsearch -x -ZZ failed"
>-fi
>-
> if [ ! -e /var/univention-join/joined ]
> then
> 	log_error "The system isn't joined yet"
> fi
> 
>-if ! ldapsearch -x -ZZ -D "$ldap_hostdn" -w "$(</etc/machine.secret)" -b "$ldap_base" -s base >>"$LOG_FILE" 2>&1
>-then
>-	log_error "localhost ldapsearch failed"
>+if [ ! -e /etc/machine.secret ]; then
>+	log_error "/etc/machine.secret not found"
>+else
>+	if ! ldapsearch -x -h "$ldap_master" -p "$ldap_master_port" -D "$ldap_hostdn" -w "$(</etc/machine.secret)" -b "$ldap_base" -s base >>"$LOG_FILE" 2>&1
>+	then
>+		log_error "ldapsearch -x failed"
>+	elif ! ldapsearch -x -ZZ -h "$ldap_master" -p "$ldap_master_port" -D "$ldap_hostdn" -w "$(</etc/machine.secret)" -b "$ldap_base" -s base >>"$LOG_FILE" 2>&1
>+	then
>+		log_error "ldapsearch -x -ZZ failed"
>+	fi
>+
>+	if ! ldapsearch -x -ZZ -D "$ldap_hostdn" -w "$(</etc/machine.secret)" -b "$ldap_base" -s base >>"$LOG_FILE" 2>&1
>+	then
>+		log_error "localhost ldapsearch failed"
>+	fi
> fi
> 
> LC_COLLATE="C"

Actions: View | Diff

Attachments on bug 34798: 5905