summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2005-06-16 03:50:55 +0000
committerDan Williams <dcbw@redhat.com>2005-06-16 03:50:55 +0000
commit29e7e000ece14ea8360dc002a47bd8b8ec83053f (patch)
treef2ec9004f2f155e07f27d35489aa75d7ff4c6b64
parent6d95dd04c0f65765cf00c90a3173dca87ccab048 (diff)
downloadNetworkManager-29e7e000ece14ea8360dc002a47bd8b8ec83053f.tar.gz
2005-05-06 Dan Williams <dcbw@redhat.com>
* src/backends/shvar.c - (svOpenFile): Open read-only to make SELinux happy git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/FC4_BRANCH@684 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
-rw-r--r--ChangeLog5
-rw-r--r--src/backends/shvar.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a9d20c46f5..85ff6befd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,11 @@
- (update_button_cb): Make sure the OK button is enabled when it should be, fixes
problem where it never enabled for ASCII Key and Hex Key types
+2005-05-06 Dan Williams <dcbw@redhat.com>
+
+ * src/backends/shvar.c
+ - (svOpenFile): Open read-only to make SELinux happy
+
2005-05-05 Dan Williams <dcbw@redhat.com>
* src/backends/NetworkManagerRedHat.c
diff --git a/src/backends/shvar.c b/src/backends/shvar.c
index 765a77e7c5..c2d1b5afbd 100644
--- a/src/backends/shvar.c
+++ b/src/backends/shvar.c
@@ -49,12 +49,17 @@ svOpenFile(const char *name, gboolean create)
s = g_malloc0(sizeof(shvarFile));
+#if 1 /* NetworkManager local change */
+ s->fd = open(name, O_RDONLY); /* NOT O_CREAT */
+ if (s->fd != -1) closefd = 1;
+#else
s->fd = open(name, O_RDWR); /* NOT O_CREAT */
if (s->fd == -1) {
/* try read-only */
s->fd = open(name, O_RDONLY); /* NOT O_CREAT */
if (s->fd != -1) closefd = 1;
}
+#endif
s->fileName = g_strdup(name);
if (s->fd != -1) {