Attachment 5667 Details for Bug 33521

[patch] univention-ldapsearch.patch

patch (text/plain), 989 bytes, created by Janek Walkenhorst on 2013-11-21 17:04 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Janek Walkenhorst

Created: 2013-11-21 17:04 CET

Size: 989 bytes

patch

obsolete

>--- a/ucs-3.2/ucs-3.2-0/base/univention-config-registry/scripts/univention-ldapsearch
>+++ b/ucs-3.2/ucs-3.2-0/base/univention-config-registry/scripts/univention-ldapsearch
>@@ -1,4 +1,4 @@
>-#!/bin/bash
>+#!/bin/sh
> #
> # Univention Configuration Registry
> # Wrap ldapsearch to pass on credentials
>@@ -30,8 +30,6 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>-eval "$(/usr/sbin/univention-config-registry shell)"
>-
> ## check for option -D to avoid "ldapsearch: -D previously specified"
> ## check for option -w to avoid "ldapsearch: -y incompatible with -w"
> for arg in "$@"; do
>@@ -43,9 +41,9 @@ for arg in "$@"; do
> done
> 
> if [ -z "$option_D_given" ]; then
>-	binddn="$ldap_binddn"
>+	binddn="$(/usr/sbin/univention-config-registry get ldap/binddn)"
> 	if [ -z "$binddn" ]; then
>-		binddn="$ldap_hostdn"
>+		binddn="$(/usr/sbin/univention-config-registry get ldap/hostdn)"
> 	fi
> 	if [ -z "$option_w_given" ]; then
> 		bindpw_file="/etc/machine.secret"

Actions: View | Diff

Attachments on bug 33521: 5667