X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev_db.c;h=8596470d4962c8694fd524d430edbcd22c02734c;hb=55e9959b155cefc5146f7a3d1ea73e74da91f303;hp=e89f2c2a15793e876ec88ca29e6b6776ffb80f54;hpb=7d563a17f3967890331daf08d43f2f005418139b;p=elogind.git

diff --git a/udev/udev_db.c b/udev/udev_db.c
index e89f2c2a1..8596470d4 100644
--- a/udev/udev_db.c
+++ b/udev/udev_db.c
@@ -1,23 +1,21 @@
 /*
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	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.,
- *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 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, either version 2 of the License, or
+ * (at your option) any later version.
  *
+ * 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, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -31,8 +29,6 @@
 #include <sys/types.h>
 
 #include "udev.h"
-#include "udev_selinux.h"
-
 
 static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len)
 {
@@ -147,9 +143,9 @@ int udev_db_add_device(struct udevice *udevice)
 	    !udevice->partitions && !udevice->ignore_remove) {
 		int ret;
 		dbg(udevice->udev, "nothing interesting to store, create symlink\n");
-		selinux_setfscreatecon(udevice->udev, filename, NULL, S_IFLNK);
+		udev_selinux_setfscreatecon(udevice->udev, filename, S_IFLNK);
 		ret = symlink(udevice->name, filename);
-		selinux_resetfscreatecon(udevice->udev);
+		udev_selinux_resetfscreatecon(udevice->udev);
 		if (ret != 0) {
 			err(udevice->udev, "unable to create db link '%s': %s\n", filename, strerror(errno));
 			return -1;