* [PATCH] udev_selinux changes
@ 2004-04-13 1:50 Kay Sievers
2004-04-16 23:05 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Kay Sievers @ 2004-04-13 1:50 UTC (permalink / raw)
To: linux-hotplug
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
Here is the fix for extras/seliux/*
o install the binary in /sbin/
o add symlink to /etc/dev.d/ with suffix .dev
o removed the undefined udev_log variable
o fixed compiler warnings
thanks,
Kay
[-- Attachment #2: 01-selinux.patch --]
[-- Type: text/plain, Size: 3629 bytes --]
===== extras/dbus/Makefile 1.3 vs edited =====
--- 1.3/extras/dbus/Makefile Sun Apr 11 14:38:01 2004
+++ edited/extras/dbus/Makefile Tue Apr 13 03:21:55 2004
@@ -53,16 +53,16 @@
install-dbus-policy:
$(INSTALL) -d $(DESTDIR)$(dbusdir)
- $(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(usrsbindir)/$(PROG)
- - ln -s -f $(DESTDIR)$(usrsbindir)/$(PROG) $(DESTDIR)$(devddir)/$(PROG).dev
uninstall-dbus-policy:
- rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
- - rm $(DESTDIR)$(devddir)/$(PROG).dev
- - rm $(DESTDIR)$(usrsbindir)/$(PROG)
install: install-dbus-policy all
+ $(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(usrsbindir)/$(PROG)
+ - ln -s -f $(DESTDIR)$(usrsbindir)/$(PROG) $(DESTDIR)$(devddir)/$(PROG).dev
uninstall: uninstall-dbus-policy
+ - rm $(DESTDIR)$(devddir)/$(PROG).dev
+ - rm $(DESTDIR)$(usrsbindir)/$(PROG)
===== extras/selinux/Makefile 1.2 vs edited =====
--- 1.2/extras/selinux/Makefile Wed Mar 24 23:41:45 2004
+++ edited/extras/selinux/Makefile Tue Apr 13 03:38:54 2004
@@ -26,7 +26,9 @@
etcdir = ${prefix}/etc
sbindir = ${exec_prefix}/sbin
usrbindir = ${exec_prefix}/usr/bin
+usrsbindir = ${exec_prefix}/usr/sbin
mandir = ${prefix}/usr/share/man
+devddir = ${etcdir}/dev.d/default
hotplugdir = ${etcdir}/hotplug.d/default
configdir = ${etcdir}/udev/
initdir = ${etcdir}/init.d/
@@ -52,8 +54,11 @@
spotless: clean
-
install: all
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+ - ln -s -f $(DESTDIR)$(sbindir)/$(PROG) $(DESTDIR)$(devddir)/$(PROG).dev
-uninstall:
+uninstall:
+ - rm $(DESTDIR)$(devddir)/$(PROG).dev
+ - rm $(DESTDIR)$(sbindir)/$(PROG)
===== extras/selinux/udev_selinux.c 1.5 vs edited =====
--- 1.5/extras/selinux/udev_selinux.c Mon Apr 5 22:20:27 2004
+++ edited/extras/selinux/udev_selinux.c Tue Apr 13 03:35:15 2004
@@ -1,10 +1,27 @@
+/*
+ * udev_selinux.c
+ *
+ * Copyright (C) 2004 Daniel J Walsh <dwalsh@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
#include <errno.h>
-#include <ctype.h>
#include <selinux/selinux.h>
#include "../../udev_lib.h"
@@ -16,16 +33,13 @@
{
va_list args;
- if (!udev_log)
- return;
-
va_start(args, format);
vsyslog(level, format, args);
va_end(args);
}
#endif
-void selinux_add_node(char *filename)
+static void selinux_add_node(char *filename)
{
int retval;
@@ -35,7 +49,7 @@
if (retval < 0) {
dbg("matchpathcon(%s) failed\n", filename);
} else {
- retval=setfilecon(filename,scontext);
+ retval = setfilecon(filename,scontext);
if (retval < 0)
dbg("setfiles %s failed with error '%s'",
filename, strerror(errno));
@@ -47,7 +61,6 @@
int main(int argc, char *argv[], char *envp[])
{
char *action;
- char *devpath;
char *devname;
int retval = 0;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-04-16 23:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-04-13 1:50 [PATCH] udev_selinux changes Kay Sievers
2004-04-16 23:05 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).