--- a/etc/univention/templates/files/etc/samba/smb.conf.d/10global	2012-01-02 12:30:22.000000000 +0100
+++ b/etc/univention/templates/files/etc/samba/smb.conf.d/10global	2012-01-11 16:55:16.000000000 +0100
@@ -26,6 +26,8 @@
 	server_services.append('-smb')
 if configRegistry.get('samba4/service/nmb', 'nmbd') == 'nmbd':
 	server_services.append('-nbtd')
+if configRegistry.is_false('samba4/service/drepl'):
+	server_services.append('-drepl')
 if server_services:
 	print '\tserver services\t=', ' '.join(server_services)
 
--- a/etc/univention/templates/files/etc/samba/smb.conf.d/11univention-smb-service	2011-11-10 15:05:02.000000000 +0100
+++ b/etc/univention/templates/files/etc/samba/smb.conf.d/11univention-smb-service	2012-01-11 16:55:16.000000000 +0100
@@ -9,8 +9,13 @@
 	debug hirestimestamp = yes
 	debug pid = yes
 
-	dcerpc endpoint servers = -unixinfo -rpcecho -spoolss -winreg -wkssvc -srvsvc
+	dcerpc endpoint servers = -unixinfo -rpcecho -spoolss -winreg -wkssvc -srvsvc''',
 
+	if configRegistry.is_false('samba4/dcerpc/endpoint/server/drsuapi'):
+		print '-drsuapi'
+
+
+	print '''
 	domain logons = yes
 	passdb backend = samba4
 	auth methods = guest samba4