Index: samba3upgrade/smb.conf.d/51univention-samba_domain
===================================================================
--- samba3upgrade/smb.conf.d/51univention-samba_domain	(Revision 55110)
+++ samba3upgrade/smb.conf.d/51univention-samba_domain	(Arbeitskopie)
@@ -48,11 +48,17 @@
 	print '\tdomain master = no'
 	print '\tpreferred master = no'
 	print '\tlocal master = no'
-@!@
 
-	os level = @%@samba/os/level@%@
-	wins support = @%@windows/wins-support@%@
-@!@
+print '\trealm = %s' % configRegistry.get('kerberos/realm')
+
+samba_os_level = configRegistry.get('samba/os/level')
+if samba_os_level:
+	print '\tos level = %s' % samba_os_level
+
+wins_support = configRegistry.get('windows/wins-support')
+if wins_support:
+	print '\twins support = %s' % wins_support
+
 if configRegistry['windows/wins-support'] != 'yes' and configRegistry['windows/wins-server']:
 	print '	wins server = %s' % configRegistry['windows/wins-server'],
 @!@
Index: samba3upgrade/smb.conf.d/91univention-samba_shares
===================================================================
--- samba3upgrade/smb.conf.d/91univention-samba_shares	(Revision 55110)
+++ samba3upgrade/smb.conf.d/91univention-samba_shares	(Arbeitskopie)
@@ -1,4 +1,8 @@
 
 ; -----------------------------------------------------------------------------------------------------------
-	include = /etc/samba/base.conf
-	include = /etc/samba/installs.conf
+@!@
+import os
+for includefilepath in ('/etc/samba/base.conf', '/etc/samba/installs.conf'):
+	if os.path.exists(includefilepath):
+		print "\tinclude =", includefilepath
+@!@
Index: samba3upgrade/smb.conf.d/92univention-samba_shares
===================================================================
--- samba3upgrade/smb.conf.d/92univention-samba_shares	(Revision 55110)
+++ samba3upgrade/smb.conf.d/92univention-samba_shares	(Arbeitskopie)
@@ -1,3 +1,6 @@
-
-	include = /etc/samba/shares.conf
-	include = /etc/samba/printers.conf
+@!@
+import os
+for includefilepath in ('/etc/samba/shares.conf', '/etc/samba/printers.conf'):
+	if os.path.exists(includefilepath):
+		print "\tinclude =", includefilepath
+@!@
Index: samba3upgrade/smb.conf.d/99univention-samba_local_shares
===================================================================
--- samba3upgrade/smb.conf.d/99univention-samba_local_shares	(Revision 55110)
+++ samba3upgrade/smb.conf.d/99univention-samba_local_shares	(Arbeitskopie)
@@ -1,3 +1,6 @@
-
-    include = /etc/samba/local.conf
-
+@!@
+import os
+for includefilepath in ('/etc/samba/local.conf', ):
+	if os.path.exists(includefilepath):
+		print "\tinclude =", includefilepath
+@!@
Index: scripts/setup-s4.sh
===================================================================
--- scripts/setup-s4.sh	(Revision 55110)
+++ scripts/setup-s4.sh	(Arbeitskopie)
@@ -277,7 +277,6 @@
 	cat /usr/share/univention-samba4/samba3upgrade/smb.conf.d/* | ucr filter > /var/lib/samba3/etc/samba/smb.conf
 	## fix up /var/lib/samba3/smb.conf for samba-tool
 	touch /etc/samba/base.conf /etc/samba/installs.conf /etc/samba/printers.conf /etc/samba/shares.conf
-	echo -e "[global]\n\trealm = $kerberos_realm" >> /var/lib/samba3/etc/samba/smb.conf
 
 	# The upgrade tool uses /var/lib/samba3/ for these files
 	#  https://forge.univention.org/bugzilla/show_bug.cgi?id=33251