Index: 20univention-directory-policy.inst
===================================================================
--- 20univention-directory-policy.inst	(Revision 36498)
+++ 20univention-directory-policy.inst	(Arbeitskopie)
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh 
 #
 # Univention Directory Policy
 #  join script
@@ -32,17 +32,11 @@
 
 VERSION=1
 
-if ! test -e "/usr/share/univention-join/.joined"; then
-	echo "The server has not joined yet"
-	exit 1
-fi
+. /usr/share/univention-join/joinscripthelper.lib  || exit 1
+joinscript_init
 
-touch /usr/lib/univention-install/.index.txt
-
-test -n "`grep "univention-directory-policy v${VERSION} successful" /usr/lib/univention-install/.index.txt`" && exit 1
-
 run-parts /usr/lib/univention-directory-policy
 
-test -n "`grep "univention-directory-policy v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-directory-policy v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
+joinscript_save_current_version
 
 exit 0