Attachment 8926 Details for Bug 44787 – dont_reprovision_if_samdb_is_ok.diff

[patch] dont_reprovision_if_samdb_is_ok.diff

dont_reprovision_if_samdb_is_ok.diff (text/plain), 1021 bytes, created by Arvid Requate on 2017-06-14 18:57:57 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2017-06-14 18:57:57 CEST

Size: 1021 bytes

patch

obsolete

>Index: 96univention-samba4.inst
>===================================================================
>--- 96univention-samba4.inst	(Revision 79986)
>+++ 96univention-samba4.inst	(Arbeitskopie)
>@@ -867,7 +867,8 @@
> 		|| [ -z "$s4connector_dc" ] \
> 		|| [ "$s4connector_dc" = "$hostname" ]; then
> 
>-		if [ $JS_LAST_EXECUTED_VERSION -lt 1 ]; then
>+		if [ $JS_LAST_EXECUTED_VERSION -lt 1 ] \
>+			&& ! ldbsearch -H /var/lib/samba/private/sam.ldb -s base '(objectSid=*)' objectSid 2>/dev/null | grep -q '^objectSid: '; then
> 			run_samba_provision "$@"
> 		fi
> 
>@@ -899,7 +900,8 @@
> 		if [ $? -eq 0 ]; then
> 			## secondary provision for selective replication
> 
>-			if [ $JS_LAST_EXECUTED_VERSION -lt 1 ]; then
>+			if [ $JS_LAST_EXECUTED_VERSION -lt 1 ] \
>+				&& ! ldbsearch -H /var/lib/samba/private/sam.ldb -s base '(objectSid=*)' objectSid 2>/dev/null | grep -q '^objectSid: '; then
> 				## special case: provision another instance of Samba 4
> 				## this is similar to univention-samba-slave-pdc
> 				run_samba_provision "$@"

Actions: View | Diff

Attachments on bug 44787: 8926