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

Collapse All | Expand All

(-)a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc (-3 / +9 lines)
 Lines 1-4    Link Here 
1 
@!@
 1 
q@!@
2 
print '\t; miscellaneous settings, mostly for file services'
 2 
print '\t; miscellaneous settings, mostly for file services'
3 
print '\toplocks = %s' % configRegistry.get('samba/oplocks', 'yes')
 3 
print '\toplocks = %s' % configRegistry.get('samba/oplocks', 'yes')
4 
print '\tlarge readwrite = %s' % configRegistry.get('samba/large_readwrite', 'yes')
 4 
print '\tlarge readwrite = %s' % configRegistry.get('samba/large_readwrite', 'yes')
 Lines 27-36   if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'): Link Here 
27 
	print '\tstore dos attributes = %s' % configRegistry.get('samba/store_dos_attributes', 'yes')
 27 
	print '\tstore dos attributes = %s' % configRegistry.get('samba/store_dos_attributes', 'yes')
28 

          28
          

        

        

          29
          
	if configRegistry.get('samba/min/protocol'):

          29
          
	if configRegistry.get('samba/min/protocol'):

        

          
            

              30
              
		print '\tmax protocol = %s' % configRegistry.get('samba/min/protocol')


              30
              
		print '\tserver min protocol = %s' % configRegistry.get('samba/min/protocol')

            

        

          31
          

          31
          

        

        

          32
          
	if configRegistry.get('samba/max/protocol'):

          32
          
	if configRegistry.get('samba/max/protocol'):

        

          
            

              33
              
		print '\tmax protocol = %s' % configRegistry.get('samba/max/protocol')


              33
              
		print '\tserver max protocol = %s' % configRegistry.get('samba/max/protocol')

            

            

              
              

              34
              

            

            


              35
              
	if configRegistry.get('samba/client/min/protocol'):

            

            


              36
              
		print '\tclient min protocol = %s' % configRegistry.get('samba/client/min/protocol')

            

            


              37
              

            

            


              38
              
	if configRegistry.get('samba/client/max/protocol'):

            

            


              39
              
		print '\tclient max protocol = %s' % configRegistry.get('samba/client/max/protocol')

            

        

          34
          

          40
          

        

        

          35
          
	if configRegistry['server/role'] != 'memberserver':

          41
          
	if configRegistry['server/role'] != 'memberserver':

        

        

          36
          
		if ( not configRegistry['samba/homedirpath'] or configRegistry['samba/homedirpath']=='local') and configRegistry['samba/homedirserver'] and configRegistry['samba/homedirserver'] == 'local':

          42
          
		if ( not configRegistry['samba/homedirpath'] or configRegistry['samba/homedirpath']=='local') and configRegistry['samba/homedirserver'] and configRegistry['samba/homedirserver'] == 'local':

        



(-)a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
      (-2 / +11 lines)




  

    

    

       Lines 26-33
      if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'): 
    
  Link Here 
    

  

        

          26
          

          26
          

        

        

          27
          
	print '\tstore dos attributes = %s' % configRegistry.get('samba/store_dos_attributes', 'yes')

          27
          
	print '\tstore dos attributes = %s' % configRegistry.get('samba/store_dos_attributes', 'yes')

        

        

          28
          

          28
          

        

          
            

              29
              
	if configRegistry.get('samba/max/protocol'):


              29
              
	if configRegistry.get('samba/client/min/protocol'):

            

            

              30
              
		print '\tmax protocol = %s' % configRegistry.get('samba/max/protocol')


              30
              
		print '\tclient min protocol = %s' % configRegistry.get('samba/client/min/protocol')

            

            

              
              

              31
              

            

            


              32
              
	if configRegistry.get('samba/client/max/protocol'):

            

            


              33
              
		print '\tclient max protocol = %s' % configRegistry.get('samba/client/max/protocol')

            

            


              34
              

            

            


              35
              
	if configRegistry.get('samba/server/min/protocol'):

            

            


              36
              
		print '\tserver min protocol = %s' % configRegistry.get('samba/server/min/protocol')

            

            


              37
              

            

            


              38
              
	if configRegistry.get('samba/server/max/protocol'):

            

            


              39
              
		print '\tserver max protocol = %s' % configRegistry.get('samba/server/max/protocol')

            

        

          31
          

          40
          

        

        

          32
          
	if configRegistry['server/role'] != 'memberserver':

          41
          
	if configRegistry['server/role'] != 'memberserver':

        

        

          33
          
		if ( not configRegistry['samba/homedirpath'] or configRegistry['samba/homedirpath']=='local') and configRegistry['samba/homedirserver'] and configRegistry['samba/homedirserver'] == 'local':

          42
          
		if ( not configRegistry['samba/homedirpath'] or configRegistry['samba/homedirpath']=='local') and configRegistry['samba/homedirserver'] and configRegistry['samba/homedirserver'] == 'local':

        






  

  Return to bug 44617