Attachment 5690 Details for Bug 33583 – patch additional lines

[patch] patch additional lines

1.diff (text/plain), 3.09 KB, created by Arvid Requate on 2013-12-09 16:32:52 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2013-12-09 16:32:52 CET

Size: 3.09 KB

patch

obsolete

>Index: univention-samba4/96univention-samba4.inst
>===================================================================
>--- univention-samba4/96univention-samba4.inst	(Revision 46574)
>+++ univention-samba4/96univention-samba4.inst	(Arbeitskopie)
>@@ -52,7 +52,7 @@
> 
> s3setup="$(ldapsearch -x -ZZ -D "$ldap_hostdn" -y /etc/machine.secret \
> 		   '(&(univentionService=Samba 3)(objectClass=univentionDomainController))' -LLL dn \
>-		   | sed -ne 's|dn: ||p')"
>+		   | ldapsearch-wrapper | sed -ne 's|dn: ||p')"
> if [ -n "$s3setup" ] && is_domain_controller; then
> 
> 	if is_ucr_true samba4/ignore/mixsetup; then
>@@ -298,7 +298,7 @@
> 			# try again with --server
> 			cn=($(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \
> 						"(&(univentionService=Samba 4)(objectClass=univentionDomainController))" cn \
>-										| sed -n 's/^cn: $.*$/\1/p' ))
>+										| ldapsearch-wrapper | sed -n 's/^cn: $.*$/\1/p' ))
> 			
> 			for name in "${cn[@]}"; do
> 				samba-tool domain join "$domainname" "$samba4_role" --server "$name.$domainname" \
>@@ -424,7 +424,7 @@
> 	if [ -z "$samba4_sysvol_sync_host" ]; then
> 		s4connectorservicedcs=$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \
> 		                        "(&(univentionService=S4 Connector)(objectClass=univentionDomainController))" cn \
>-								| sed -n 's/^cn: $.*$/\1/p')      ## currently there is no u-d-m module computers/dc
>+								| ldapsearch-wrapper | sed -n 's/^cn: $.*$/\1/p')      ## currently there is no u-d-m module computers/dc
> 		if [ -n "$s4connectorservicedcs" ]; then
> 			univention-config-registry set samba4/sysvol/sync/host="$s4connectorservicedcs"
> 		fi
>@@ -684,7 +684,7 @@
> 	## check if we there already is a **domaincontroller** providing the service "Samba 4"
> 	samba4servicedcs=$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \
> 	                   "(&(univentionService=${NAME})(objectClass=univentionDomainController))" cn \
>-					   | sed -n 's/^cn: $.*$/\1/p')	## currently there is no u-d-m module computers/dc
>+					   | ldapsearch-wrapper | sed -n 's/^cn: $.*$/\1/p')	## currently there is no u-d-m module computers/dc
> 
> 	/etc/init.d/samba-ad-dc stop
> 
>Index: univention-samba4/98univention-samba4-dns.inst
>===================================================================
>--- univention-samba4/98univention-samba4-dns.inst	(Revision 46574)
>+++ univention-samba4/98univention-samba4-dns.inst	(Arbeitskopie)
>@@ -73,7 +73,7 @@
> fi
> 
> # Change the dns/backend to samba4 only whether a S4 Connector is installed in our domain
>-s4connectorservicedcs="$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret "(&(univentionService=S4 Connector)(objectClass=univentionDomainController))" cn | sed -n 's/^cn: $.*$/\1/p')"
>+s4connectorservicedcs="$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret "(&(univentionService=S4 Connector)(objectClass=univentionDomainController))" cn | ldapsearch-wrapper | sed -n 's/^cn: $.*$/\1/p')"
> 
> if [ $JS_LAST_EXECUTED_VERSION = 0 ] && [ "$dns_backend" != "samba4" ] && [ -n "$s4connectorservicedcs" ]; then
> 	univention-config-registry set dns/backend=samba4

Actions: View | Diff

Attachments on bug 33583: 5690