commit 81eb99e3b4635989ff40d1949876de386caada1f
Author: Florian Best <best@univention.de>
Date:   Thu Mar 18 19:19:22 2021 +0100

    Bug #31996: remove support for --bindpwd credential passing

diff --git management/univention-join/joinscripthelper.lib management/univention-join/joinscripthelper.lib
index 0c215d572d..590306008e 100644
--- management/univention-join/joinscripthelper.lib
+++ management/univention-join/joinscripthelper.lib
@@ -325,14 +325,6 @@ joinscript_remove_credentialfiles () {
 	test -e /var/run/univention-join/binddn && rm /var/run/univention-join/binddn
 }
 
-# join script can be called with --bindpwdfile
-joinscript_check_api_bindpwdfile () {
-	if grep -q '^## joinscript api: bindpwdfile$' "$1"; then
-		return 0
-	fi
-	return 1
-}
-
 # join script does not require domain credentials to be passed
 joinscript_check_api_nocredentials () {
 	if grep -q '^## joinscript api: nocredentials$' "$1"; then
diff --git management/univention-join/univention-join management/univention-join/univention-join
index 40b1306655..c2351d2c27 100755
--- management/univention-join/univention-join
+++ management/univention-join/univention-join
@@ -205,12 +205,10 @@ run_join_scripts () {
 			fi
 
 			local args=()
-			if joinscript_check_api_bindpwdfile "$i"; then
-				args=(--binddn "$binddn" --bindpwdfile "$DCPWD")
-			elif joinscript_check_api_nocredentials "$i"; then
+			if joinscript_check_api_nocredentials "$i"; then
 				args=()
 			else
-				args=(--binddn "$binddn" --bindpwd "$(<"$DCPWD")")
+				args=(--binddn "$binddn" --bindpwdfile "$DCPWD")
 			fi
 			$bashVerbose "$i" "${args[@]}" >>/var/log/univention/join.log 2>&1
 
diff --git management/univention-join/univention-run-join-scripts management/univention-join/univention-run-join-scripts
index a9dfe64863..4c05dc3324 100755
--- management/univention-join/univention-run-join-scripts
+++ management/univention-join/univention-run-join-scripts
@@ -272,12 +272,10 @@ then
 
 		if [ ! "$server_role" = "domaincontroller_master" ] || [ -n "$ASK_PASS" ] ; then
 			args=()
-			if joinscript_check_api_bindpwdfile "$i"; then
-				args=(--binddn "$binddn" --bindpwdfile "$DCPWD")
-			elif joinscript_check_api_nocredentials "$i"; then
+			if joinscript_check_api_nocredentials "$i"; then
 				args=()
 			else
-				args=(--binddn "$binddn" --bindpwd "$(<"$DCPWD")")
+				args=(--binddn "$binddn" --bindpwdfile "$DCPWD")
 			fi
 			"$i" "${args[@]}" 3>&-
 		else