Index: conffiles/etc/samba/smb.conf.d/11univention-smb-service
===================================================================
--- conffiles/etc/samba/smb.conf.d/11univention-smb-service	(Revision 39836)
+++ conffiles/etc/samba/smb.conf.d/11univention-smb-service	(Arbeitskopie)
@@ -1,6 +1,6 @@
 @!@
 print '; ---------------------<smb service configuration>-----------------------'
-if configRegistry.get('samba4/service/smb', 's3fs'):
+if configRegistry.get('samba4/service/smb', 's3fs') == 's3fs':
 	print '''
 	debug hirestimestamp = yes
 	debug pid = yes'''
@@ -11,7 +11,7 @@
 	if dcerpc_endpoints:
 		print '\tdcerpc endpoint servers\t=', ' '.join(dcerpc_endpoints)
 
-elif configRegistry.get('samba4/service/smb', 'smbd'):
+elif configRegistry.get('samba4/service/smb', 'smbd') == 'smbd':
 	if configRegistry['samba4/role'] != 'MEMBER':	## otherwise it's already set in 10global
 		print '\tsecurity = ads'
 
Index: conffiles/etc/samba/smb.conf.d/10global
===================================================================
--- conffiles/etc/samba/smb.conf.d/10global	(Revision 39836)
+++ conffiles/etc/samba/smb.conf.d/10global	(Arbeitskopie)
@@ -26,7 +26,7 @@
 server_services = ['-dns']
 if configRegistry.get('samba4/service/smb', 'smbd') == 'smbd':
 	server_services.append('-smb')
-elif configRegistry.get('samba4/service/smb', 's3fs'):
+elif configRegistry.get('samba4/service/smb', 's3fs') == 's3fs':
 	server_services.extend(['-smb', '+s3fs'])
 if configRegistry.get('samba4/service/nmb', 'nmbd') == 'nmbd':
 	server_services.append('-nbt')