Attachment 5724 Details for Bug 33895

[patch] custom_Administrator_univention-samba.patch

custom_Administrator_univention-samba.patch (text/plain), 3.16 KB, created by Arvid Requate on 2014-01-09 18:55 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2014-01-09 18:55 CET

Size: 3.16 KB

patch

obsolete

>Index: univention-samba/debian/control
>===================================================================
>--- univention-samba/debian/control	(Revision 46805)
>+++ univention-samba/debian/control	(Arbeitskopie)
>@@ -26,7 +26,7 @@
>  python-tdb,
>  samba-common-bin,
>  shell-univention-lib (>= 1.0.6),
>- python-univention-lib (>= 1.0.45)
>+ python-univention-lib (>= 3.0.26-14)
> Conflicts: samba-ad-dc,
>  samba-dsdb-modules
> Description: UCS - Samba domain controller
>Index: univention-samba/26univention-samba.inst
>===================================================================
>--- univention-samba/26univention-samba.inst	(Revision 46805)
>+++ univention-samba/26univention-samba.inst	(Arbeitskopie)
>@@ -234,8 +234,11 @@
> 	test -x /etc/init.d/winbind && { /etc/init.d/winbind start; sleep 3; }
> 
> 	# set default printer permissions
>-	net rpc rights -U${samba_account}%${samba_pwd} grant Printer-Admins SePrintOperatorPrivilege
>-	net rpc rights -U${samba_account}%${samba_pwd} grant Administrator SePrintOperatorPrivilege
>+	users_default_administrator=$(custom_username "Administrator")
>+	net rpc rights -U${samba_account}%${samba_pwd} \
>+		grant "$users_default_administrator" SePrintOperatorPrivilege
>+	net rpc rights -U${samba_account}%${samba_pwd} \
>+		grant Printer-Admins SePrintOperatorPrivilege
> 
> else
> 	# stop samba
>Index: univention-samba/conffiles/etc/samba/base.conf
>===================================================================
>--- univention-samba/conffiles/etc/samba/base.conf	(Revision 46805)
>+++ univention-samba/conffiles/etc/samba/base.conf	(Arbeitskopie)
>@@ -32,8 +32,8 @@
> 			print '\tacl_xattr:ignore system acls = yes'
> 	elif samba4_ntacl_backend == 'tdb':
> 		print '\tvfs objects = acl_tdb'
>-@!@
> 
>+	print '''
> [printers]
> 	comment = Drucker
> 	browseable = no
>@@ -43,12 +43,12 @@
> 	writable = no
> 	create mode = 0700
> 	# use client driver = true
>-	# lpq command = lpstat -o %p
>-	# lprm command = cancel %p-%j
>+	# lpq command = lpstat -o %%p
>+	# lprm command = cancel %%p-%%j
> 	# using windows printer drivers
>-	# print command = lpr -P %p -o raw %s -r
>+	# print command = lpr -P %%p -o raw %%s -r
> 	# using cups drivers (PostScript on Windows)
>-	# print command = lpr -P %p %s
>+	# print command = lpr -P %%p %%s
> 
> [print$]
> 	comment = Printer Drivers
>@@ -56,7 +56,9 @@
> 	browseable = yes
> 	guest ok = no
> 	read only = no
>-	write list = root, Administrator, @Printer-Admins
>+	write list = root, %(_default_administrator)s, @Printer-Admins
>+''' % {"_default_administrator": custom_username("Administrator")}
>+@!@
> 
> @!@
> if configRegistry.is_true('samba/share/netlogon', True):
>Index: univention-samba/debian/univention-samba.postinst
>===================================================================
>--- univention-samba/debian/univention-samba.postinst	(Revision 46805)
>+++ univention-samba/debian/univention-samba.postinst	(Arbeitskopie)
>@@ -86,9 +86,11 @@
> fi
> 
> 
>+users_default_administrator=$(custom_username "Administrator")
>+
> univention-config-registry set samba/share/home?yes \
> 							   samba/share/groups?no \
>-							   samba/adminusers?"administrator join-backup"
>+							   samba/adminusers?"$users_default_administrator join-backup"
> 
> if [ "$server_role" != "memberserver" ]
> then

Actions: View | Diff

Attachments on bug 33895: 5724