On Mon, Aug 23, 2004 at 06:50:14PM -0400, Joshua Brindle wrote:
> Greg KH wrote:
>
> >Please fix that patch up to:
> > - not have any ifdef in the .c files
> > - use the proper coding style
> > - use the same convention as the other build flags have.
> >
> >Actually, what was wrong with the older selinux support in udev that was
> >there? Why not just dig that stuff up and see if it works or not (I bet
> >it does...) If so, I'll be glad to add it back in, it's just that too
> >many people complained about it when it was in there...
> >
> >
> Who complained and why? When selinux support wasn't built in the
> functions were just stubs, how could that have possibly had any effect
> whatsoever on anyone else?
I had complaints from SELinux users, not anyone else. I don't remember
the exact complaints, sorry.
> If you could, please paste a patch from the older version so that we can
> see here whether it should work right (it's possible that the libselinux
> api changed between then and now)
Hm, it's a bit hard to dig that up. But here's a patch that you can
reverse that should add the support back in. You'll have to just dig
out the udev_selinux.c file from an older version of udev to see the
code there.
If you want me to put the code back, I'll be glad to, just structure it
properly and I have no problems with it.
thanks,
greg k-h
diff -Nru a/udev-add.c b/udev-add.c
--- a/udev-add.c 2004-08-23 16:05:17 -07:00
+++ b/udev-add.c 2004-08-23 16:05:17 -07:00
@@ -39,7 +39,6 @@
#include "udev.h"
#include "udev_lib.h"
#include "udev_version.h"
-#include "udev_selinux.h"
#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
@@ -276,9 +275,6 @@
}
}
}
-
- if (!fake)
- selinux_add_node(filename);
/* create symlink if requested */
foreach_strpart(dev->symlink, " ", pos, len) {
diff -Nru a/udev_selinux.h b/udev_selinux.h
--- a/udev_selinux.h 2004-08-23 16:05:17 -07:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-#ifndef UDEV_SELINUX_H
-#define UDEV_SELINUX_H
-
-#ifdef USE_SELINUX
-extern void selinux_add_node(char *filename);
-#else
-static void selinux_add_node(char *filename) { }
-#endif
-
-#endif
