aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcvs-fast-export <cvs-fast-export>2003-04-09 14:36:59 +0000
committercvs-fast-export <cvs-fast-export>2003-04-09 14:36:59 +0000
commitef5e2f2f36d61379db0b0cfecce8ee6e0a1900f9 (patch)
tree7d612c582624e6a7135a411473c9bc7f20f47366
parentsync'd configs (diff)
downloadportage-cvs-portage_2_0_47_r15.tar.gz
portage-cvs-portage_2_0_47_r15.tar.bz2
portage-cvs-portage_2_0_47_r15.zip
Synthetic commit for incomplete tag portage_2_0_47_r15portage_2_0_47_r15
-rw-r--r--src/sandbox-1.1/ChangeLog18
-rw-r--r--src/sandbox-1.1/libsandbox.c4
2 files changed, 3 insertions, 19 deletions
diff --git a/src/sandbox-1.1/ChangeLog b/src/sandbox-1.1/ChangeLog
index 9988bf4..5317225 100644
--- a/src/sandbox-1.1/ChangeLog
+++ b/src/sandbox-1.1/ChangeLog
@@ -1,22 +1,6 @@
# ChangeLog for Path Sandbox
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/ChangeLog,v 1.15 2003/04/06 09:06:48 azarah Exp $
-
- 06 Apr 2003; Martin Schlemmer <azarah@gentoo.org> libsandbox.c :
- For some reason sandbox fails with a 'open_wr' if you run 'locale -a' under
- it (bug #16298).
-
- Problem is that for some reason locale fopen's locale.alias with mode "rm".
-
- -------------------------------------------------------
- nosferatu root # grep fopen locale.log
- fopen("/usr/share/locale/locale.alias", "rm"ACCESS DENIED open_wr: /usr/share/locale/locale.alias
- nosferatu root #
- --------------------------------------------------------
-
- I checked the source of locale, but it have fopen with mode 'r', so
- not sure where the "rm" mode comes from. Anyhow, changed the check in
- before_syscall_open_char() to also see mode "rm" as readonly.
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/ChangeLog,v 1.14 2003/02/23 13:13:36 azarah Exp $
23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> create-localdecls :
diff --git a/src/sandbox-1.1/libsandbox.c b/src/sandbox-1.1/libsandbox.c
index 4fb81dd..8d64af9 100644
--- a/src/sandbox-1.1/libsandbox.c
+++ b/src/sandbox-1.1/libsandbox.c
@@ -25,7 +25,7 @@ S * Path sandbox for the gentoo linux portage package system, initially
* as some of the InstallWatch code was used.
*
*
- * $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/libsandbox.c,v 1.4 2003/04/06 09:06:48 azarah Exp $
+ * $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/libsandbox.c,v 1.3 2002/12/04 00:51:30 azarah Exp $
*
*/
@@ -1176,7 +1176,7 @@ static int before_syscall_open_int(const char* func, const char* file, int flags
static int before_syscall_open_char(const char* func, const char* file, const char* mode)
{
- if ((strcmp(mode, "r") == 0) || (strcmp(mode, "rb") == 0) || (strcmp(mode, "rm") == 0)) {
+ if ((strcmp(mode, "r") == 0) || (strcmp(mode, "rb") == 0)) {
return before_syscall("open_rd", file);
} else {
return before_syscall("open_wr", file);