Attachment 5866 Details for Bug 34527 – custom_username_for_samba_adminusers.patch

[patch] custom_username_for_samba_adminusers.patch

custom_username_for_samba_adminusers.patch (text/plain), 1.62 KB, created by Arvid Requate on 2014-04-10 14:03:06 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2014-04-10 14:03:06 CEST

Size: 1.62 KB

patch

obsolete

>Index: univention-samba4/conffiles/etc/samba/smb.conf.d/71univention-samba_users
>===================================================================
>--- univention-samba4/conffiles/etc/samba/smb.conf.d/71univention-samba_users	(Revision 48537)
>+++ univention-samba4/conffiles/etc/samba/smb.conf.d/71univention-samba_users	(Arbeitskopie)
>@@ -1,4 +1,10 @@
> @!@
>+from univention.lib.misc import custom_username
>+import re
>+
>+def split_preserving_quotes(input):
>+	return [p for p in re.split("( |\\\".*?\\\"|'.*?')", input) if p.strip()]
>+
> if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'):
> 	print '\tguest account = %s' % configRegistry.get('samba/guest_account', 'nobody')	
> 	print '\tmap to guest = %s' % configRegistry.get('samba/map_to_guest', 'Bad User')	
>@@ -5,5 +11,5 @@
> 	invalid_users=configRegistry.get('samba/invalid_users', '')
> 	if invalid_users:
> 		print '\tinvalid users = %s' % invalid_users
>-	print '\tadmin users = %s' % configRegistry.get('samba/adminusers')
>+	print '\tadmin users = %s' % " ".join(map(custom_username, split_preserving_quotes(configRegistry.get('samba/adminusers'))))
> @!@
>Index: univention-samba4/debian/univention-samba4.univention-config-registry
>===================================================================
>--- univention-samba4/debian/univention-samba4.univention-config-registry	(Revision 48537)
>+++ univention-samba4/debian/univention-samba4.univention-config-registry	(Arbeitskopie)
>@@ -24,6 +24,8 @@
> Variables: windows/wins-.*
> Variables: cups/server
> Variables: server/role
>+Variables: users/default/.*
>+Variables: groups/default/.*
> 
> Type: subfile
> Multifile: etc/samba/smb.conf

Actions: View | Diff

Attachments on bug 34527: 5866