summaryrefslogtreecommitdiff
path: root/sysutils/system-tools-backends/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/system-tools-backends/files')
-rw-r--r--sysutils/system-tools-backends/files/patch-Users_Users.pm26
-rw-r--r--sysutils/system-tools-backends/files/patch-policykit46
2 files changed, 13 insertions, 59 deletions
diff --git a/sysutils/system-tools-backends/files/patch-Users_Users.pm b/sysutils/system-tools-backends/files/patch-Users_Users.pm
index 5e2598972c24..909f28dff134 100644
--- a/sysutils/system-tools-backends/files/patch-Users_Users.pm
+++ b/sysutils/system-tools-backends/files/patch-Users_Users.pm
@@ -1,42 +1,42 @@
---- Users/Users.pm.orig Thu Oct 5 09:27:21 2006
-+++ Users/Users.pm Sun Apr 22 23:05:41 2007
-@@ -458,7 +458,7 @@
+--- Users/Users.pm.orig 2009-09-28 05:49:10.000000000 -0400
++++ Users/Users.pm 2009-10-11 15:09:31.000000000 -0400
+@@ -443,7 +443,7 @@ sub del_user
if ($Utils::Backend::tool{"system"} eq "FreeBSD")
{
-- $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' ";
-+ $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' -r ";
+- @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN]);
++ @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN], "-r");
}
else
{
-@@ -538,10 +538,10 @@
- {
+@@ -551,9 +551,7 @@ sub add_user
my $pwdpipe;
my $home;
-+ my $user;
- # FreeBSD doesn't create the home directory
$home = $$user[$HOME];
-- &Utils::File::run ("$tool_mkdir -p $home");
-+ $user = $$user[$LOGIN];
+- &Utils::File::run ($tool_mkdir, "-p", $home);
$command = "$cmd_pw useradd " .
" -n \'" . $$user[$LOGIN] . "\'" .
-@@ -549,11 +549,12 @@
+@@ -561,7 +559,7 @@ sub add_user
" -d \'" . $$user[$HOME] . "\'" .
" -g \'" . $$user[$GID] . "\'" .
" -s \'" . $$user[$SHELL] . "\'" .
- " -H 0"; # pw(8) reads password from STDIN
+ " -m -h 0"; # pw(8) reads password from STDIN
+ # @command = ($cmd_pw, "useradd", "-n", $$user[$LOGIN],
+ # "-u", $$user[$UID],
+@@ -573,6 +571,7 @@ sub add_user
$pwdpipe = &Utils::File::run_pipe_write ($command);
print $pwdpipe $$user[$PASSWD];
&Utils::File::close_file ($pwdpipe);
-+ &Utils::File::run ("chown -R $user $home");
++ &Utils::File::run ("chown -R " . $$user[$LOGIN] . " $home");
}
elsif ($Utils::Backend::tool{"system"} eq "SunOS")
{
-@@ -629,7 +630,7 @@
+@@ -651,7 +650,7 @@ sub change_user
" -d \'" . $$new_user[$HOME] . "\'" .
" -g \'" . $$new_user[$GID] . "\'" .
" -s \'" . $$new_user[$SHELL] . "\'" .
diff --git a/sysutils/system-tools-backends/files/patch-policykit b/sysutils/system-tools-backends/files/patch-policykit
deleted file mode 100644
index aaac9aa69979..000000000000
--- a/sysutils/system-tools-backends/files/patch-policykit
+++ /dev/null
@@ -1,46 +0,0 @@
-Allow root to send messages to all the system tools backends, so they
-work even when CVE-2008-4311 has been fixed.
-
-Also disallow normal user access by destination, not by interface (fd.o
-#18961).
-
-Original patch by Simon McVittie, updated for the PolicyKit version by
-Josselin Mouette with advice from Colin Walters.
-
-Index: system-tools-backends-2.6.0/system-tools-backends.conf
-===================================================================
---- system-tools-backends.conf 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends.conf 2009-03-11 22:21:09.145371060 +0100
-@@ -22,11 +22,7 @@
- <allow send_interface="org.freedesktop.SystemToolsBackends.Platform" send_member="getPlatform"/>
- -->
-
-- <!-- configuration modules can't be accessed directly... -->
-- <deny send_interface="org.freedesktop.SystemToolsBackends"/>
-- <deny send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
--
-- <!-- ...so petitions go through the dispatcher instead -->
-+ <!-- Only allow talking to the dispatcher -->
- <allow send_destination="org.freedesktop.SystemToolsBackends"/>
- </policy>
-
-@@ -49,7 +45,17 @@
-
- <!-- be able to speak to configuration modules,
- so any message to them has to go through the dispatcher -->
-- <allow send_interface="org.freedesktop.SystemToolsBackends"/>
-- <allow send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.GroupsConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.HostsConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.IfacesConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.NFSConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.NTPConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.ServicesConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.SMBConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.TimeConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.UserConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.UsersConfig"/>
- </policy>
- </busconfig>