View | Details | Raw Unified | Return to bug 33896
Collapse All | Expand All

(-)univention-samba4/debian/control (-1 / +1 lines)
 Lines 16-22    Link Here 
16 
 univention-config-registry (>= 8.0.2-1),
 16 
 univention-config-registry (>= 8.0.2-1),
17 
 univention-directory-manager-tools (>> 7.0.147),
 17 
 univention-directory-manager-tools (>> 7.0.147),
18 
 shell-univention-lib (>= 3.0.22-1),
 18 
 shell-univention-lib (>= 3.0.22-1),
19 
 python-univention-lib (>= 1.0.45),
 19 
 python-univention-lib (>= 3.0.26-14),
20 
 python-univention (>= 6.0.9-3),
 20 
 python-univention (>= 6.0.9-3),
21 
 samba (>= 4.1),
 21 
 samba (>= 4.1),
22 
 samba-ad-dc,
 22 
 samba-ad-dc,
(-)univention-samba4/conffiles/etc/samba/base.conf (-6 / +8 lines)
 Lines 1-6    Link Here 
1 
@%@UCRWARNING=# @%@
 1 
@%@UCRWARNING=# @%@
2 

          2
          

        

        

          3
          
@!@

          3
          
@!@

        

            

              
              
              4
              
from univention.lib.misc import custom_username

            

            

              5
              

            

        

          4
          
if configRegistry.is_true('samba/share/netlogon', True):

          6
          
if configRegistry.is_true('samba/share/netlogon', True):

        

        

          5
          
	print '[netlogon]'

          7
          
	print '[netlogon]'

        

        

          6
          
	print '\tcomment = Domain logon service'

          8
          
	print '\tcomment = Domain logon service'

        

  

    

    

       Lines 89-100
       
    
  Link Here 
    

  

        

          89
          
	writable = no

          91
          
	writable = no

        

        

          90
          
	create mode = 0700

          92
          
	create mode = 0700

        

        

          91
          
	# use client driver = true

          93
          
	# use client driver = true

        

          
            

              92
              
	# lpq command = lpstat -o %p


              94
              
	# lpq command = lpstat -o %%p

            

            

              93
              
	# lprm command = cancel %p-%j


              95
              
	# lprm command = cancel %%p-%%j

            

        

          94
          
	# using windows printer drivers

          96
          
	# using windows printer drivers

        

          
            

              95
              
	# print command = lpr -P %p -o raw %s -r


              97
              
	# print command = lpr -P %%p -o raw %%s -r

            

        

          96
          
	# using cups drivers (PostScript on Windows)

          98
          
	# using cups drivers (PostScript on Windows)

        

          
            

              97
              
	# print command = lpr -P %p %s


              99
              
	# print command = lpr -P %%p %%s

            

        

          98
          

          100
          

        

        

          99
          
[print$]

          101
          
[print$]

        

        

          100
          
	comment = Printer Drivers

          102
          
	comment = Printer Drivers

        

  

    

    

       Lines 102-109
       
    
  Link Here 
    

  

        

          102
          
	browseable = yes

          104
          
	browseable = yes

        

        

          103
          
	guest ok = no

          105
          
	guest ok = no

        

        

          104
          
	read only = no

          106
          
	read only = no

        

          
            

              105
              
	write list = root, Administrator, @Printer-Admins


              107
              
	write list = root, %(_default_administrator)s, @Printer-Admins

            

            

              106
              
'''


              108
              
''' % {"_default_administrator": custom_username("Administrator")}

            

        

          107
          
@!@

          109
          
@!@

        

        

          108
          

          110
          

        

        

          109
          

          111
          

        



(-)univention-samba4/debian/univention-samba4.postinst
      (-1 / +3 lines)




  

    

    

       Lines 76-86
       
    
  Link Here 
    

  

        

          76
          
	fi

          76
          
	fi

        

        

          77
          
fi

          77
          
fi

        

        

          78
          

          78
          

        

            

              
              
              79
              
users_default_administrator=$(custom_username "Administrator")

            

            

              80
              

            

        

          79
          
## samba3 defaults copied from univention-samba

          81
          
## samba3 defaults copied from univention-samba

        

        

          80
          
univention-config-registry set \

          82
          
univention-config-registry set \

        

        

          81
          
	samba/share/home?yes \

          83
          
	samba/share/home?yes \

        

        

          82
          
	samba/share/groups?no \

          84
          
	samba/share/groups?no \

        

          
            

              83
              
	samba/adminusers?"administrator join-backup" \


              85
              
	samba/adminusers?"$users_default_administrator join-backup" \

            

        

          84
          
	samba/encrypt_passwords?yes \

          86
          
	samba/encrypt_passwords?yes \

        

        

          85
          
	samba/use_spnego?yes \

          87
          
	samba/use_spnego?yes \

        

        

          86
          
	samba/oplocks?yes \

          88
          
	samba/oplocks?yes \

        



(-)univention-samba4/scripts/setup-s4.sh
      (-1 / +2 lines)




  

    

    

       Lines 300-306
       
    
  Link Here 
    

  

        

          300
          
	set_machine_secret

          300
          
	set_machine_secret

        

        

          301
          

          301
          

        

        

          302
          
	## finally set the Administrator password, which samba3upgrade did not migrate

          302
          
	## finally set the Administrator password, which samba3upgrade did not migrate

        

          
            

              303
              
	samba-tool user setpassword Administrator --newpassword="$adminpw"


              303
              
	users_default_administrator=$(custom_username "Administrator")

            

            

              
              

              304
              
	samba-tool user setpassword "$users_default_administrator" --newpassword="$adminpw"

            

        

          304
          
fi

          305
          
fi

        

        

          305
          

          306
          

        

        

          306
          
if [ ! -d /etc/phpldapadmin ]; then

          307
          
if [ ! -d /etc/phpldapadmin ]; then

        






  

  Return to bug 33896