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

(-)a/test/ucs-test-tools/usr/sbin/import_ldif_with_listener (-1 / +1 lines)
 Lines 39-45   sambaSID="$(get_sambaSID)" Link Here 
39
39
40
prepare_ldif_for_ldapadd "$1" >$ldif
40
prepare_ldif_for_ldapadd "$1" >$ldif
41
41
42
backup_and_remove_ldap_objects
42
backup_and_remove_ldap_objects "$ldif"
43
43
44
ldapadd -x -D "cn=admin,$ldap_base" -y /etc/ldap.secret -f "$ldif"
44
ldapadd -x -D "cn=admin,$ldap_base" -y /etc/ldap.secret -f "$ldif"
45
45
(-)a/test/ucs-test-tools/usr/sbin/import_ldif_without_listener (-1 / +1 lines)
 Lines 39-45   sambaSID="$(get_sambaSID)" Link Here 
39
39
40
prepare_ldif_for_slapadd "$1" >$ldif
40
prepare_ldif_for_slapadd "$1" >$ldif
41
41
42
backup_and_remove_ldap_objects
42
backup_and_remove_ldap_objects "$ldif"
43
43
44
stop_slapd
44
stop_slapd
45
45
(-)a/test/ucs-test-tools/usr/share/ucs-test-tools/common-lib.sh (-7 / +2 lines)
 Lines 62-75   change_performance_settings () Link Here 
62
62
63
backup_and_remove_ldap_objects ()
63
backup_and_remove_ldap_objects ()
64
{
64
{
65
	for dn in "cn=Windows Hosts,cn=groups,$ldap_base" \
65
	grep "^dn:" "$1" | sed 's/^dn: //g' | awk '{ print length($0) " " $0; }' | sort -r -n | cut -d ' ' -f 2- | while read dn;
66
		"cn=Domain Users,cn=groups,$ldap_base" \
67
		"cn=DC Backup Hosts,cn=groups,$ldap_base" \
68
		"cn=DC Slave Hosts,cn=groups,$ldap_base" \
69
		"cn=Computers,cn=groups,$ldap_base" \
70
		"cn=default containers,cn=univention,$ldap_base"
71
	do
66
	do
72
		univention-ldapsearch -b "$dn" >>/var/univention-backup/import-backup.ldif
67
		univention-ldapsearch -LLLs base -b "$dn" 2>/dev/null >>/var/univention-backup/import-backup.ldif || continue
73
		ldapdelete -x -D cn=admin,$ldap_base -y /etc/ldap.secret "$dn"
68
		ldapdelete -x -D cn=admin,$ldap_base -y /etc/ldap.secret "$dn"
74
	done
69
	done
75
}
70
}

Return to bug 36695