diff options
| -rw-r--r-- | extras/dbus/Makefile | 10 | ||||
| -rw-r--r-- | extras/selinux/Makefile | 9 | ||||
| -rw-r--r-- | extras/selinux/udev_selinux.c | 31 |
3 files changed, 34 insertions, 16 deletions
diff --git a/extras/dbus/Makefile b/extras/dbus/Makefile index 04f17605e8..0cfc650c4b 100644 --- a/extras/dbus/Makefile +++ b/extras/dbus/Makefile @@ -53,16 +53,16 @@ spotless: clean 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) diff --git a/extras/selinux/Makefile b/extras/selinux/Makefile index 813756700b..35d2e9e6da 100644 --- a/extras/selinux/Makefile +++ b/extras/selinux/Makefile @@ -26,7 +26,9 @@ exec_prefix = ${prefix} 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 @@ clean: 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) diff --git a/extras/selinux/udev_selinux.c b/extras/selinux/udev_selinux.c index df23d9e6a7..8b1c2c7da8 100644 --- a/extras/selinux/udev_selinux.c +++ b/extras/selinux/udev_selinux.c @@ -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 @@ void log_message(int level, const char *format, ...) { 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 @@ void selinux_add_node(char *filename) 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 @@ void selinux_add_node(char *filename) int main(int argc, char *argv[], char *envp[]) { char *action; - char *devpath; char *devname; int retval = 0; |