Attachment #5690 for bug #33583

View | Details | Raw Unified | Return to bug 33583
Collapse All | Expand All





s3setup="$(ldapsearch -x -ZZ -D "$ldap_hostdn" -y /etc/machine.secret \
		   '(&(univentionService=Samba 3)(objectClass=univentionDomainController))' -LLL dn \
		   | ldapsearch-wrapper | sed -ne 's|dn: ||p')"
if [ -n "$s3setup" ] && is_domain_controller; then

	if is_ucr_true samba4/ignore/mixsetup; then

			# try again with --server
			cn=($(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \
						"(&(univentionService=Samba 4)(objectClass=univentionDomainController))" cn \
										| ldapsearch-wrapper | sed -n 's/^cn: \(.*\)/\1/p' ))
			
			for name in "${cn[@]}"; do
				samba-tool domain join "$domainname" "$samba4_role" --server "$name.$domainname" \

	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 \
								| 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

	## 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 \
					   | 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


Lines 73-79 Link Here

(-)univention-samba4/98univention-samba4-dns.inst (-1 / +1 lines)
73	fi	73	fi
74		74
75	# Change the dns/backend to samba4 only whether a S4 Connector is installed in our domain	75	# Change the dns/backend to samba4 only whether a S4 Connector is installed in our domain
76	s4connectorservicedcs="$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret "(&(univentionService=S4 Connector)(objectClass=univentionDomainController))" cn \| sed -n 's/^cn: $.*$/\1/p')"	76	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')"
77		77
78	if [ $JS_LAST_EXECUTED_VERSION = 0 ] && [ "$dns_backend" != "samba4" ] && [ -n "$s4connectorservicedcs" ]; then	78	if [ $JS_LAST_EXECUTED_VERSION = 0 ] && [ "$dns_backend" != "samba4" ] && [ -n "$s4connectorservicedcs" ]; then
79	univention-config-registry set dns/backend=samba4	79	univention-config-registry set dns/backend=samba4

Return to bug 33583

Lines 52-58 Link Here

(-)univention-samba4/96univention-samba4.inst (-4 / +4 lines)
52		52
53	s3setup="$(ldapsearch -x -ZZ -D "$ldap_hostdn" -y /etc/machine.secret \	53	s3setup="$(ldapsearch -x -ZZ -D "$ldap_hostdn" -y /etc/machine.secret \
54	'(&(univentionService=Samba 3)(objectClass=univentionDomainController))' -LLL dn \	54	'(&(univentionService=Samba 3)(objectClass=univentionDomainController))' -LLL dn \
55	\| sed -ne 's\|dn: \|\|p')"	55	\| ldapsearch-wrapper \| sed -ne 's\|dn: \|\|p')"
56	if [ -n "$s3setup" ] && is_domain_controller; then	56	if [ -n "$s3setup" ] && is_domain_controller; then
57		57
58	if is_ucr_true samba4/ignore/mixsetup; then	58	if is_ucr_true samba4/ignore/mixsetup; then
Lines 298-304 Link Here
298	# try again with --server	298	# try again with --server
299	cn=($(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \	299	cn=($(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \
300	"(&(univentionService=Samba 4)(objectClass=univentionDomainController))" cn \	300	"(&(univentionService=Samba 4)(objectClass=univentionDomainController))" cn \
301	\| sed -n 's/^cn: \(.*\)/\1/p' ))	301	\| ldapsearch-wrapper \| sed -n 's/^cn: \(.*\)/\1/p' ))
302		302
303	for name in "${cn[@]}"; do	303	for name in "${cn[@]}"; do
304	samba-tool domain join "$domainname" "$samba4_role" --server "$name.$domainname" \	304	samba-tool domain join "$domainname" "$samba4_role" --server "$name.$domainname" \
Lines 424-430 Link Here
424	if [ -z "$samba4_sysvol_sync_host" ]; then	424	if [ -z "$samba4_sysvol_sync_host" ]; then
425	s4connectorservicedcs=$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \	425	s4connectorservicedcs=$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \
426	"(&(univentionService=S4 Connector)(objectClass=univentionDomainController))" cn \	426	"(&(univentionService=S4 Connector)(objectClass=univentionDomainController))" cn \
427	\| sed -n 's/^cn: \(.*\)/\1/p') ## currently there is no u-d-m module computers/dc	427	\| ldapsearch-wrapper \| sed -n 's/^cn: \(.*\)/\1/p') ## currently there is no u-d-m module computers/dc
428	if [ -n "$s4connectorservicedcs" ]; then	428	if [ -n "$s4connectorservicedcs" ]; then
429	univention-config-registry set samba4/sysvol/sync/host="$s4connectorservicedcs"	429	univention-config-registry set samba4/sysvol/sync/host="$s4connectorservicedcs"
430	fi	430	fi
Lines 684-690 Link Here
684	## check if we there already is a domaincontroller providing the service "Samba 4"	684	## check if we there already is a domaincontroller providing the service "Samba 4"
685	samba4servicedcs=$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \	685	samba4servicedcs=$(ldapsearch -x -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret \
686	"(&(univentionService=${NAME})(objectClass=univentionDomainController))" cn \	686	"(&(univentionService=${NAME})(objectClass=univentionDomainController))" cn \
687	\| sed -n 's/^cn: \(.*\)/\1/p') ## currently there is no u-d-m module computers/dc	687	\| ldapsearch-wrapper \| sed -n 's/^cn: \(.*\)/\1/p') ## currently there is no u-d-m module computers/dc
688		688
689	/etc/init.d/samba-ad-dc stop	689	/etc/init.d/samba-ad-dc stop
690		690