Attachment 7347 Details for Bug 37995 – univention-sudo.diff

[patch] univention-sudo.diff

37995_univention-sudo.diff (text/plain), 3.26 KB, created by Philipp Hahn on 2015-12-04 15:10:03 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2015-12-04 15:10:03 CET

Size: 3.26 KB

patch

obsolete

>diff --git a/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/conffiles/etc/sudoers.d/univention b/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/conffiles/etc/sudoers.d/univention
>index a2e9dc2..d8285ce 100644
>--- a/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/conffiles/etc/sudoers.d/univention
>+++ b/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/conffiles/etc/sudoers.d/univention
>@@ -3,6 +3,9 @@
> # Allow members of group "Domain Admins" to execute any command
> ## %Domain\ Admins ALL=(ALL:ALL) ALL
> @!@
>-da = configRegistry.get("groups/default/domainadmins", "Domain Admins").replace(" ", "\ ")
>-print "%{} ALL=(ALL:ALL) ALL".format(da)
>+import re
>+group = configRegistry.get("groups/default/domainadmins", "Domain Admins")
>+if group:
>+	da = re.sub(r'([ !=:,()\\])', r'\\\1', group)
>+	print "%{} ALL=(ALL:ALL) ALL".format(da)
> @!@
>diff --git a/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/postinst b/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/postinst
>deleted file mode 100644
>index cbe6e09..0000000
>--- a/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/postinst
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-#!/bin/sh
>-#
>-# Univention Suso
>-#  postinst script
>-#
>-# Copyright 2015 Univention GmbH
>-#
>-# http://www.univention.de/
>-#
>-# All rights reserved.
>-#
>-# The source code of this program is made available
>-# under the terms of the GNU Affero General Public License version 3
>-# (GNU AGPL V3) as published by the Free Software Foundation.
>-#
>-# Binary versions of this program provided by Univention to you as
>-# well as other copyrighted, protected or trademarked materials like
>-# Logos, graphics, fonts, specific documentations and configurations,
>-# cryptographic keys etc. are subject to a license agreement between
>-# you and Univention and not subject to the GNU AGPL V3.
>-#
>-# In the case you use this program under the terms of the GNU AGPL V3,
>-# the program is provided in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>-# GNU Affero General Public License for more details.
>-#
>-# You should have received a copy of the GNU Affero General Public
>-# License with the Debian GNU/Linux or Univention distribution in file
>-# /usr/share/common-licenses/AGPL-3; if not, see
>-# <http://www.gnu.org/licenses/>.
>-
>-#DEBHELPER#
>-
>-# should already be like this, but lets make sure
>-chmod 0440 /etc/sudoers.d/*
>-
>-exit 0
>diff --git a/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/univention-sudo.univention-config-registry b/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/univention-sudo.univention-config-registry
>index ece5dba..94dc8dd 100644
>--- a/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/univention-sudo.univention-config-registry
>+++ b/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/univention-sudo.univention-config-registry
>@@ -1,3 +1,6 @@
> Type: file
> File: etc/sudoers.d/univention
> Variables: groups/default/domainadmins
>+User: root
>+Group: root
>+Mode: 0440
>diff --git a/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/univention-sudo.univention-config-registry-variables b/branches/ucs-4.1/ucs-4.1-0/base/univention-sudo/debian/univention-sudo.univention-config-registry-variables
>deleted file mode 100644
>index e69de29..0000000

Actions: View | Diff

Attachments on bug 37995: 7347 | 7352