View | Details | Raw Unified | Return to bug 15306 | Differences between
and this patch

Collapse All | Expand All

(-)debian/postinst (+1 lines)
 Lines 64-69    Link Here 
64 
univention-config-registry set samba/share/home?yes
 64 
univention-config-registry set samba/share/home?yes
65 
univention-config-registry set samba/share/groups?no
 65 
univention-config-registry set samba/share/groups?no
66 
univention-config-registry set samba/adminusers?administrator
 66 
univention-config-registry set samba/adminusers?administrator
67 
univention-config-registry set samba/ipv6?yes
67 

          68
          

        

        

          68
          
if [ "$server_role" != "memberserver" ]

          69
          
if [ "$server_role" != "memberserver" ]

        

        

          69
          
then

          70
          
then

        



(-)debian/univention-samba.univention-config-registry
      (+1 lines)




  

    

    

       Lines 18-23
       
    
  Link Here 
    

  

        

          18
          
Variables: samba/charset.*

          18
          
Variables: samba/charset.*

        

        

          19
          
Variables: samba/enable-privileges

          19
          
Variables: samba/enable-privileges

        

        

          20
          
Variables: samba/socket_options

          20
          
Variables: samba/socket_options

        

            

              
              
              21
              
Variables: samba/ipv6

            

        

          21
          

          22
          

        

        

          22
          
Type: subfile

          23
          
Type: subfile

        

        

          23
          
Multifile: etc/samba/smb.conf

          24
          
Multifile: etc/samba/smb.conf

        



(-)debian/changelog
      (+19 lines)




  

    

    

       Lines 1-3
       
    
  Link Here 
    

  

            

              
              
              1
              
univention-samba (4.1.2-1) unstable; urgency=low

            

            

              2
              

            

            

              3
              
  * makes UCR variable samba/ipv6=yes on installation if not set (Bug #15306)

            

            

              4
              

            

            

              5
              
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu, 27 Aug 2009 15:43:35 +0200

            

            

              6
              

            

            

              7
              
univention-samba (4.1.1-1) unstable; urgency=low

            

            

              8
              

            

            

              9
              
  * fixed typo in /etc/univention/templates/files/etc/samba/smb.conf.d/01univention-samba_main (Bug #15306)

            

            

              10
              

            

            

              11
              
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu, 27 Aug 2009 13:21:28 +0200

            

            

              12
              

            

            

              13
              
univention-samba (4.1.0-1) unstable; urgency=low

            

            

              14
              

            

            

              15
              
  * add UCR variable samba/ipv6 which forces samba to serve SMB requests only on IPv4-adresses if set to 'No'.

            

            

              16
              
    Takes only effect if UCR variables samba/interfaces and/or samba/interfaces/bindonly aren't set. (Bug #15306)

            

            

              17
              

            

            

              18
              
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu, 27 Aug 2009 11:46:08 +0200

            

            

              19
              

            

        

          1
          
univention-samba (4.0.5-1) unstable; urgency=low

          20
          
univention-samba (4.0.5-1) unstable; urgency=low

        

        

          2
          

          21
          

        

        

          3
          
  * make samba-option "bind interfaces only" configurable via UCR (Bug #13483)

          22
          
  * make samba-option "bind interfaces only" configurable via UCR (Bug #13483)

        



(-)debian/univention-samba.univention-config-registry-variables
      (+6 lines)




  

    

    

       Lines 297-299
       
    
  Link Here 
    

  

        

          297
          
Description[en]=Limits Samba to listen only on the interfaces listed in samba/interfaces.

          297
          
Description[en]=Limits Samba to listen only on the interfaces listed in samba/interfaces.

        

        

          298
          
Type=str

          298
          
Type=str

        

        

          299
          
Categories=service-samba

          299
          
Categories=service-samba

        

            

              
              
              300
              

            

            

              301
              
[samba/ipv6]

            

            

              302
              
Description[de]='No' zwingt Samba dazu, nur IPv4 zu benutzen.

            

            

              303
              
Description[en]='No' forces samba to only use IPv4.

            

            

              304
              
Type=str

            

            

              305
              
Categories=service-samba

            



(-)conffiles/etc/samba/smb.conf.d/01univention-samba_main
      (-5 / +12 lines)




  

    

    

       Lines 23-36
       
    
  Link Here 
    

  

        

          23
          
	print '\tserver string = %h univention corporate server'

          23
          
	print '\tserver string = %h univention corporate server'

        

        

          24
          

          24
          

        

        

          25
          
for key, smbstring in [('samba/interfaces','interfaces'),

          25
          
for key, smbstring in [('samba/interfaces','interfaces'),

        

          
            

              26
              
		       ('samba/charset/dos', 'dos charset'),


              26
              
					   ('samba/charset/dos', 'dos charset'),

            

            

              27
              
		       ('samba/charset/unix', 'unix charset'),


              27
              
					   ('samba/charset/unix', 'unix charset'),

            

            

              28
              
		       ('samba/charset/display', 'display charset'),


              28
              
					   ('samba/charset/display', 'display charset'),

            

            

              29
              
		       ('samba/enable-privileges', 'enable privileges'),


              29
              
					   ('samba/enable-privileges', 'enable privileges'),

            

            

              30
              
			   ('samba/interfaces/bindonly', 'bind interfaces only'),]:


              30
              
					   ('samba/interfaces/bindonly', 'bind interfaces only'),]:

            

        

          31
          
	if baseConfig.has_key(key) and baseConfig[key]:

          31
          
	if baseConfig.has_key(key) and baseConfig[key]:

        

        

          32
          
		print '\t%s = %s' % (smbstring, baseConfig[key])

          32
          
		print '\t%s = %s' % (smbstring, baseConfig[key])

        

        

          33
          

          33
          

        

        

          34
          
if baseConfig.has_key('samba/socket_options') and baseConfig['samba/socket_options']:

          34
          
if baseConfig.has_key('samba/socket_options') and baseConfig['samba/socket_options']:

        

        

          35
          
	print '\tsocket options = %s' % baseConfig['samba/socket_options']

          35
          
	print '\tsocket options = %s' % baseConfig['samba/socket_options']

        

            

              
              
              36
              

            

            

              37
              
if 'samba/interfaces' not in configRegistry.keys() and 'samba/interfaces/bindonly' not in configRegistry.keys():

            

            

              38
              
	if configRegistry.get('samba/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):

            

            

              39
              
		print '\n\t; only IPv4-adresses will serve SMB requests:'

            

            

              40
              
		print '\tinterfaces = 255.255.255.255/0 127.0.0.1'

            

            

              41
              
		print '\tbind interfaces only = yes'

            

            

              42
              

            

        

          36
          
@!@

          43
          
@!@

        






  

  Return to bug 15306