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

(-)univention-samba/debian/control (-1 / +1 lines)
 Lines 26-32    Link Here 
26
 python-tdb,
26
 python-tdb,
27
 samba-common-bin,
27
 samba-common-bin,
28
 shell-univention-lib (>= 1.0.6),
28
 shell-univention-lib (>= 1.0.6),
29
 python-univention-lib (>= 1.0.45)
29
 python-univention-lib (>= 3.0.26-14)
30
Conflicts: samba-ad-dc,
30
Conflicts: samba-ad-dc,
31
 samba-dsdb-modules
31
 samba-dsdb-modules
32
Description: UCS - Samba domain controller
32
Description: UCS - Samba domain controller
(-)univention-samba/26univention-samba.inst (-2 / +5 lines)
 Lines 234-241    Link Here 
234
	test -x /etc/init.d/winbind && { /etc/init.d/winbind start; sleep 3; }
234
	test -x /etc/init.d/winbind && { /etc/init.d/winbind start; sleep 3; }
235
235
236
	# set default printer permissions
236
	# set default printer permissions
237
	net rpc rights -U${samba_account}%${samba_pwd} grant Printer-Admins SePrintOperatorPrivilege
237
	users_default_administrator=$(custom_username "Administrator")
238
	net rpc rights -U${samba_account}%${samba_pwd} grant Administrator SePrintOperatorPrivilege
238
	net rpc rights -U${samba_account}%${samba_pwd} \
239
		grant "$users_default_administrator" SePrintOperatorPrivilege
240
	net rpc rights -U${samba_account}%${samba_pwd} \
241
		grant Printer-Admins SePrintOperatorPrivilege
239
242
240
else
243
else
241
	# stop samba
244
	# stop samba
(-)univention-samba/conffiles/etc/samba/base.conf (-6 / +8 lines)
 Lines 32-39    Link Here 
32
			print '\tacl_xattr:ignore system acls = yes'
32
			print '\tacl_xattr:ignore system acls = yes'
33
	elif samba4_ntacl_backend == 'tdb':
33
	elif samba4_ntacl_backend == 'tdb':
34
		print '\tvfs objects = acl_tdb'
34
		print '\tvfs objects = acl_tdb'
35
@!@
36
35
36
	print '''
37
[printers]
37
[printers]
38
	comment = Drucker
38
	comment = Drucker
39
	browseable = no
39
	browseable = no
 Lines 43-54    Link Here 
43
	writable = no
43
	writable = no
44
	create mode = 0700
44
	create mode = 0700
45
	# use client driver = true
45
	# use client driver = true
46
	# lpq command = lpstat -o %p
46
	# lpq command = lpstat -o %%p
47
	# lprm command = cancel %p-%j
47
	# lprm command = cancel %%p-%%j
48
	# using windows printer drivers
48
	# using windows printer drivers
49
	# print command = lpr -P %p -o raw %s -r
49
	# print command = lpr -P %%p -o raw %%s -r
50
	# using cups drivers (PostScript on Windows)
50
	# using cups drivers (PostScript on Windows)
51
	# print command = lpr -P %p %s
51
	# print command = lpr -P %%p %%s
52
52
53
[print$]
53
[print$]
54
	comment = Printer Drivers
54
	comment = Printer Drivers
 Lines 56-62    Link Here 
56
	browseable = yes
56
	browseable = yes
57
	guest ok = no
57
	guest ok = no
58
	read only = no
58
	read only = no
59
	write list = root, Administrator, @Printer-Admins
59
	write list = root, %(_default_administrator)s, @Printer-Admins
60
''' % {"_default_administrator": custom_username("Administrator")}
61
@!@
60
62
61
@!@
63
@!@
62
if configRegistry.is_true('samba/share/netlogon', True):
64
if configRegistry.is_true('samba/share/netlogon', True):
(-)univention-samba/debian/univention-samba.postinst (-1 / +3 lines)
 Lines 86-94    Link Here 
86
fi
86
fi
87
87
88
88
89
users_default_administrator=$(custom_username "Administrator")
90
89
univention-config-registry set samba/share/home?yes \
91
univention-config-registry set samba/share/home?yes \
90
							   samba/share/groups?no \
92
							   samba/share/groups?no \
91
							   samba/adminusers?"administrator join-backup"
93
							   samba/adminusers?"$users_default_administrator join-backup"
92
94
93
if [ "$server_role" != "memberserver" ]
95
if [ "$server_role" != "memberserver" ]
94
then
96
then

Return to bug 33895