libudev: get rid of selinux

[elogind.git] / udev / udevadm.c

diff --git a/udev/udevadm.c b/udev/udevadm.c
index bfa704ef21754b9472c4bd297c9e7002a8821590..3671b9ee590148c4f3c137ce9fce677830b94c83 100644 (file)
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -1,23 +1,20 @@
 /*
  * Copyright (C) 2007-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 "config.h"
-
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -127,9 +124,9 @@ int main(int argc, char *argv[])
 {
        struct udev *udev;
        static const struct option options[] = {
-               { "debug", 0, NULL, 'd' },
-               { "help", 0, NULL, 'h' },
-               { "version", 0, NULL, 'V' },
+               { "debug", no_argument, NULL, 'd' },
+               { "help", no_argument, NULL, 'h' },
+               { "version", no_argument, NULL, 'V' },
                {}
        };
        const char *command;
@@ -143,6 +140,7 @@ int main(int argc, char *argv[])
 
        logging_init("udevadm");
        udev_set_log_fn(udev, log_fn);
+       selinux_init(udev);
        sysfs_init();
 
        /* see if we are a compat link, this will be removed in a future release */
@@ -167,8 +165,8 @@ int main(int argc, char *argv[])
                                prog[len] = '\0';
                                fprintf(stderr, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
                                       "this will stop working in a future release\n", prog, argv[0], command);
-                               info(udev, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
-                                    "this will stop working in a future release\n", prog, argv[0], command);
+                               err(udev, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
+                                   "this will stop working in a future release\n", prog, argv[0], command);
                        }
                        rc = run_command(udev, &cmds[i], argc, argv);
                        goto out;
@@ -214,6 +212,7 @@ int main(int argc, char *argv[])
        rc = 2;
 out:
        sysfs_cleanup();
+       selinux_exit(udev);
        udev_unref(udev);
        logging_close();
        return rc;