Commit a542ec14 authored by Mike Gabriel's avatar Mike Gabriel
Browse files

White-space-only change: Fix broken and inconsistent indentations.

parent c47eabe5

debian/changelog

+5 −0
Original line number Diff line number Diff line 
debian-edu-config (2.10.67) UNRELEASED; urgency=medium



  [ Wolfgang Schweer ]

  * Adjust debian/debian-edu-config.fetch-ldap-cert. (Closes: #934380)

    - Use independent conditions to make sure that the LDAP server certificate

      is only downloaded once for both host and LTSP chroot.

    - Add code to validate the LDAP server certificate in case the Debian Edu

      RootCA certificate is available for download.



  [ Mike Gabriel ]

  * Code review debian-edu-config.fetch-ldap-cert:

    - White-space-only change: Fix broken and inconsistent indentations.



 -- Wolfgang Schweer <wschweer@arcor.de>  Sat, 10 Aug 2019 14:14:26 +0200



debian-edu-config (2.10.66) unstable; urgency=medium

debian/debian-edu-config.fetch-ldap-cert

+103 −94
Original line number Diff line number Diff line
@@ -26,12 +26,15 @@ BUNDLECRT=/etc/ssl/certs/debian-edu-bundle.crt 
ROOTCACRT=/etc/ssl/certs/Debian-Edu_rootCA.crt



do_start() {



	# Locate LDAP server

	LDAPSERVER=$(debian-edu-ldapserver)

	LDAPPORT=636 # ldaps

	ERROR=false



	if [ ! -f $CERTFILE ] &&  [ -f /etc/nslcd.conf ] &&

	    grep -q /etc/ssl/certs/debian-edu-server.crt /etc/nslcd.conf ; then



		if [ -z "$LDAPSERVER" ] ; then

			msg="Failed to locate LDAP server"

			log_action_begin_msg "$msg"
@@ -39,7 +42,9 @@ do_start() { 
			logger -t fetch-ldap-cert "$msg."

			return 1

		fi



		[ "$VERBOSE" != no ] && log_action_begin_msg "Fetching LDAP SSL certificate."



		if echo | openssl s_client -connect "$LDAPSERVER:$LDAPPORT" 2>/dev/null | grep RootCA ; then

			if curl -sfk --head -o /dev/null https://www.intern ; then

				if curl -k https://www.intern/Debian-Edu_rootCA.crt > $ROOTCACRT && \
@@ -56,7 +61,6 @@ do_start() { 
						rm -f $BUNDLECRT

						logger -t fetch-ldap-cert "Failed to fetch certificates from www.intern."

					fi

	    fi

			else

					log_action_end_msg 1

					logger -t fetch-ldap-cert "Failed to connect to www.intern, maybe the web server down."
@@ -67,6 +71,7 @@ do_start() { 
			chmod 644 $CERTFILE.new

			logger -t fetch-ldap-cert "Fetched pre Buster LDAP server certificate."

		fi



		if test -s $CERTFILE.new ; then

			mv $CERTFILE.new $CERTFILE

			[ "$VERBOSE" != no ] && log_action_end_msg 0
@@ -81,8 +86,11 @@ do_start() { 
			logger -t fetch-ldap-cert "Failed to fetch LDAP SSL certificate from $LDAPSERVER."

			ERROR=true

		fi



	fi



	if [ -d /opt/ltsp ] ; then



		for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do

			if [ ! -f $ltsp_chroot$CERTFILE ] && [ -f $ltsp_chroot/etc/nslcd.conf ] &&

			    grep -q /etc/ssl/certs/debian-edu-server.crt $ltsp_chroot/etc/nslcd.conf ; then
@@ -112,6 +120,7 @@ do_start() { 
			fi

		done

	fi



	if $ERROR; then

		return 1

	fi