Attachment 8854 Details for Bug 44617

[patch] Patch 2: Switch to samba/server/max/protocol so client minimal versions can be added

smb-minimal.patch2 (text/plain), 3.13 KB, created by Mathieu Simon on 2017-05-16 17:32 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Simon

Created: 2017-05-16 17:32 CEST

Size: 3.13 KB

patch

obsolete

>diff --git a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc b/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
>index ad7d08c..ea79c44 100644
>--- a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
>+++ b/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
>@@ -1,4 +1,4 @@
>-@!@
>+q@!@
> print '\t; miscellaneous settings, mostly for file services'
> print '\toplocks = %s' % configRegistry.get('samba/oplocks', 'yes')
> print '\tlarge readwrite = %s' % configRegistry.get('samba/large_readwrite', 'yes')
>@@ -27,10 +27,16 @@ if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'):
> 	print '\tstore dos attributes = %s' % configRegistry.get('samba/store_dos_attributes', 'yes')
> 
> 	if configRegistry.get('samba/min/protocol'):
>-		print '\tmax protocol = %s' % configRegistry.get('samba/min/protocol')
>+		print '\tserver min protocol = %s' % configRegistry.get('samba/min/protocol')
> 
> 	if configRegistry.get('samba/max/protocol'):
>-		print '\tmax protocol = %s' % configRegistry.get('samba/max/protocol')
>+		print '\tserver max protocol = %s' % configRegistry.get('samba/max/protocol')
>+
>+	if configRegistry.get('samba/client/min/protocol'):
>+		print '\tclient min protocol = %s' % configRegistry.get('samba/client/min/protocol')
>+
>+	if configRegistry.get('samba/client/max/protocol'):
>+		print '\tclient max protocol = %s' % configRegistry.get('samba/client/max/protocol')
> 
> 	if configRegistry['server/role'] != 'memberserver':
> 		if ( not configRegistry['samba/homedirpath'] or configRegistry['samba/homedirpath']=='local') and configRegistry['samba/homedirserver'] and configRegistry['samba/homedirserver'] == 'local':
>
>diff --git a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc b/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
>index 4f4c891..d33ee4b 100644
>--- a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
>+++ b/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
>@@ -26,8 +26,17 @@ if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'):
> 
> 	print '\tstore dos attributes = %s' % configRegistry.get('samba/store_dos_attributes', 'yes')
> 
>-	if configRegistry.get('samba/max/protocol'):
>-		print '\tmax protocol = %s' % configRegistry.get('samba/max/protocol')
>+	if configRegistry.get('samba/client/min/protocol'):
>+		print '\tclient min protocol = %s' % configRegistry.get('samba/client/min/protocol')
>+
>+	if configRegistry.get('samba/client/max/protocol'):
>+		print '\tclient max protocol = %s' % configRegistry.get('samba/client/max/protocol')
>+
>+	if configRegistry.get('samba/server/min/protocol'):
>+		print '\tserver min protocol = %s' % configRegistry.get('samba/server/min/protocol')
>+
>+	if configRegistry.get('samba/server/max/protocol'):
>+		print '\tserver max protocol = %s' % configRegistry.get('samba/server/max/protocol')
> 
> 	if configRegistry['server/role'] != 'memberserver':
> 		if ( not configRegistry['samba/homedirpath'] or configRegistry['samba/homedirpath']=='local') and configRegistry['samba/homedirserver'] and configRegistry['samba/homedirserver'] == 'local':

Actions: View | Diff

Attachments on bug 44617: 8853 | 8854