Attachment 1970 Details for Bug 15306

[patch] Patch: univention-samba 4.1.2 für univention-samba 4.0.5 aus trunk

univention-samba-4.1.2.patch (text/plain), 4.55 KB, created by Kai Bolte on 2009-11-05 11:11 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Bolte

Created: 2009-11-05 11:11 CET

Size: 4.55 KB

patch

obsolete

>Index: debian/postinst
>===================================================================
>--- debian/postinst	(.../ucs/services/univention-samba)	(Revision 11385)
>+++ debian/postinst	(.../component/ipv6/univention-samba)	(Revision 13469)
>@@ -64,6 +64,7 @@
> univention-config-registry set samba/share/home?yes
> univention-config-registry set samba/share/groups?no
> univention-config-registry set samba/adminusers?administrator
>+univention-config-registry set samba/ipv6?yes
> 
> if [ "$server_role" != "memberserver" ]
> then
>Index: debian/univention-samba.univention-config-registry
>===================================================================
>--- debian/univention-samba.univention-config-registry	(.../ucs/services/univention-samba)	(Revision 11385)
>+++ debian/univention-samba.univention-config-registry	(.../component/ipv6/univention-samba)	(Revision 13469)
>@@ -18,6 +18,7 @@
> Variables: samba/charset.*
> Variables: samba/enable-privileges
> Variables: samba/socket_options
>+Variables: samba/ipv6
> 
> Type: subfile
> Multifile: etc/samba/smb.conf
>Index: debian/changelog
>===================================================================
>--- debian/changelog	(.../ucs/services/univention-samba)	(Revision 11385)
>+++ debian/changelog	(.../component/ipv6/univention-samba)	(Revision 13469)
>@@ -1,3 +1,22 @@
>+univention-samba (4.1.2-1) unstable; urgency=low
>+
>+  * makes UCR variable samba/ipv6=yes on installation if not set (Bug #15306)
>+
>+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu, 27 Aug 2009 15:43:35 +0200
>+
>+univention-samba (4.1.1-1) unstable; urgency=low
>+
>+  * fixed typo in /etc/univention/templates/files/etc/samba/smb.conf.d/01univention-samba_main (Bug #15306)
>+
>+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu, 27 Aug 2009 13:21:28 +0200
>+
>+univention-samba (4.1.0-1) unstable; urgency=low
>+
>+  * add UCR variable samba/ipv6 which forces samba to serve SMB requests only on IPv4-adresses if set to 'No'.
>+    Takes only effect if UCR variables samba/interfaces and/or samba/interfaces/bindonly aren't set. (Bug #15306)
>+
>+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu, 27 Aug 2009 11:46:08 +0200
>+
> univention-samba (4.0.5-1) unstable; urgency=low
> 
>   * make samba-option "bind interfaces only" configurable via UCR (Bug #13483)
>Index: debian/univention-samba.univention-config-registry-variables
>===================================================================
>--- debian/univention-samba.univention-config-registry-variables	(.../ucs/services/univention-samba)	(Revision 11385)
>+++ debian/univention-samba.univention-config-registry-variables	(.../component/ipv6/univention-samba)	(Revision 13469)
>@@ -297,3 +297,9 @@
> Description[en]=Limits Samba to listen only on the interfaces listed in samba/interfaces.
> Type=str
> Categories=service-samba
>+
>+[samba/ipv6]
>+Description[de]='No' zwingt Samba dazu, nur IPv4 zu benutzen.
>+Description[en]='No' forces samba to only use IPv4.
>+Type=str
>+Categories=service-samba
>\ Kein Zeilenvorschub am Ende der Datei
>Index: conffiles/etc/samba/smb.conf.d/01univention-samba_main
>===================================================================
>--- conffiles/etc/samba/smb.conf.d/01univention-samba_main	(.../ucs/services/univention-samba)	(Revision 11385)
>+++ conffiles/etc/samba/smb.conf.d/01univention-samba_main	(.../component/ipv6/univention-samba)	(Revision 13469)
>@@ -23,14 +23,21 @@
> 	print '\tserver string = %h univention corporate server'
> 
> for key, smbstring in [('samba/interfaces','interfaces'),
>-		       ('samba/charset/dos', 'dos charset'),
>-		       ('samba/charset/unix', 'unix charset'),
>-		       ('samba/charset/display', 'display charset'),
>-		       ('samba/enable-privileges', 'enable privileges'),
>-			   ('samba/interfaces/bindonly', 'bind interfaces only'),]:
>+					   ('samba/charset/dos', 'dos charset'),
>+					   ('samba/charset/unix', 'unix charset'),
>+					   ('samba/charset/display', 'display charset'),
>+					   ('samba/enable-privileges', 'enable privileges'),
>+					   ('samba/interfaces/bindonly', 'bind interfaces only'),]:
> 	if baseConfig.has_key(key) and baseConfig[key]:
> 		print '\t%s = %s' % (smbstring, baseConfig[key])
> 
> if baseConfig.has_key('samba/socket_options') and baseConfig['samba/socket_options']:
> 	print '\tsocket options = %s' % baseConfig['samba/socket_options']
>+
>+if 'samba/interfaces' not in configRegistry.keys() and 'samba/interfaces/bindonly' not in configRegistry.keys():
>+	if configRegistry.get('samba/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
>+		print '\n\t; only IPv4-adresses will serve SMB requests:'
>+		print '\tinterfaces = 255.255.255.255/0 127.0.0.1'
>+		print '\tbind interfaces only = yes'
>+
> @!@

Actions: View | Diff

Attachments on bug 15306: 1970 | 2042