Attachment 5725 Details for Bug 33896 – custom_Administrator_univention-samba4.patch

[patch] custom_Administrator_univention-samba4.patch

custom_Administrator_univention-samba4.patch (text/plain), 2.99 KB, created by Arvid Requate on 2014-01-09 18:56:32 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2014-01-09 18:56:32 CET

Size: 2.99 KB

patch

obsolete

>Index: univention-samba4/debian/control
>===================================================================
>--- univention-samba4/debian/control	(Revision 46643)
>+++ univention-samba4/debian/control	(Arbeitskopie)
>@@ -16,7 +16,7 @@
>  univention-config-registry (>= 8.0.2-1),
>  univention-directory-manager-tools (>> 7.0.147),
>  shell-univention-lib (>= 3.0.22-1),
>- python-univention-lib (>= 1.0.45),
>+ python-univention-lib (>= 3.0.26-14),
>  python-univention (>= 6.0.9-3),
>  samba (>= 4.1),
>  samba-ad-dc,
>Index: univention-samba4/conffiles/etc/samba/base.conf
>===================================================================
>--- univention-samba4/conffiles/etc/samba/base.conf	(Revision 46903)
>+++ univention-samba4/conffiles/etc/samba/base.conf	(Arbeitskopie)
>@@ -1,6 +1,8 @@
> @%@UCRWARNING=# @%@
> 
> @!@
>+from univention.lib.misc import custom_username
>+
> if configRegistry.is_true('samba/share/netlogon', True):
> 	print '[netlogon]'
> 	print '\tcomment = Domain logon service'
>@@ -89,12 +91,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
>@@ -102,8 +104,8 @@
> 	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")}
> @!@
> 
> 
>Index: univention-samba4/debian/univention-samba4.postinst
>===================================================================
>--- univention-samba4/debian/univention-samba4.postinst	(Revision 46643)
>+++ univention-samba4/debian/univention-samba4.postinst	(Arbeitskopie)
>@@ -76,11 +76,13 @@
> 	fi
> fi
> 
>+users_default_administrator=$(custom_username "Administrator")
>+
> ## samba3 defaults copied from univention-samba
> univention-config-registry set \
> 	samba/share/home?yes \
> 	samba/share/groups?no \
>-	samba/adminusers?"administrator join-backup" \
>+	samba/adminusers?"$users_default_administrator join-backup" \
> 	samba/encrypt_passwords?yes \
> 	samba/use_spnego?yes \
> 	samba/oplocks?yes \
>Index: univention-samba4/scripts/setup-s4.sh
>===================================================================
>--- univention-samba4/scripts/setup-s4.sh	(Revision 46643)
>+++ univention-samba4/scripts/setup-s4.sh	(Arbeitskopie)
>@@ -300,7 +300,8 @@
> 	set_machine_secret
> 
> 	## finally set the Administrator password, which samba3upgrade did not migrate
>-	samba-tool user setpassword Administrator --newpassword="$adminpw"
>+	users_default_administrator=$(custom_username "Administrator")
>+	samba-tool user setpassword "$users_default_administrator" --newpassword="$adminpw"
> fi
> 
> if [ ! -d /etc/phpldapadmin ]; then

Actions: View | Diff

Attachments on bug 33896: 5725