From: Timothy <timothy@diyab.net>
To: SELinux <SELinux@tycho.nsa.gov>
Subject: Non-PAM Policycoreutils
Date: Thu, 13 Oct 2005 14:00:33 -0400 [thread overview]
Message-ID: <434EA0C1.7050706@diyab.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160
This patch against policycoreutils 1.26 will make it compile and install
correctly based on the presence of PAM. Please apply.
Timothy,
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFDTqDBSYq2KfPEK/gRA756AJ9oCl/vMApYBq/OaU3r2f7xDQ/e4wCfUAwq
45D5J2w39LVqofg29jbiAqs=
=jUzT
-----END PGP SIGNATURE-----
[-- Attachment #2: policycoreutils-1.26-nopam.patch --]
[-- Type: text/plain, Size: 3414 bytes --]
--- policycoreutils-1.26/newrole/Makefile 2005-07-18 09:42:21.000000000 -0400
+++ policycoreutils-1.26.slack/newrole/Makefile 2005-10-04 01:03:09.000000000 -0400
@@ -4,10 +4,18 @@
MANDIR ?= $(PREFIX)/share/man
ETCDIR ?= $(DESTDIR)/etc
LOCALEDIR = /usr/share/locale
+PAMH = $(shell ls /usr/include/pam.h 2>/dev/null)
CFLAGS ?= -Werror -Wall -W
-override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
-LDLIBS += -lselinux -lpam -lpam_misc -L$(PREFIX)/lib
+override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+LDLIBS += -lselinux -L$(PREFIX)/lib
+ifeq (${PAMH}, /usr/include/pam.h)
+ override CFLAGS += -DUSE_PAM
+ LDLIBS += -lpam -lpam_misc
+else
+ LDLIBS += -lcrypt
+endif
+
TARGETS=$(patsubst %.c,%,$(wildcard *.c))
@@ -19,7 +27,10 @@
test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1
install -m 555 newrole $(BINDIR)
install -m 644 newrole.1 $(MANDIR)/man1/
+ifeq (${PAMH}, /usr/include/pam.h)
+ test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d
install -m 644 newrole.pamd $(ETCDIR)/pam.d/newrole
+endif
clean:
rm -f $(TARGETS) *.o
--- policycoreutils-1.26/newrole/newrole.c 2005-07-11 15:18:42.000000000 -0400
+++ policycoreutils-1.26.slack/newrole/newrole.c 2005-10-04 00:58:45.000000000 -0400
@@ -215,6 +215,7 @@
************************************************************************/
+#define __USE_XOPEN
#include <unistd.h> /* for getuid(), exit(), crypt() */
#include <shadow.h> /* for shadow passwd functions */
#include <string.h> /* for strlen(), memset() */
--- policycoreutils-1.26/run_init/Makefile 2005-07-18 09:42:21.000000000 -0400
+++ policycoreutils-1.26.slack/run_init/Makefile 2005-10-04 01:02:21.000000000 -0400
@@ -5,10 +5,17 @@
MANDIR ?= $(PREFIX)/share/man
ETCDIR ?= $(DESTDIR)/etc
LOCALEDIR ?= /usr/share/locale
+PAMH = $(shell ls /usr/include/pam.h 2>/dev/null)
CFLAGS ?= -Werror -Wall -W
-override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
-LDLIBS += -lselinux -lpam -lpam_misc -L$(PREFIX)/lib
+override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+LDLIBS += -lselinux -L$(PREFIX)/lib
+ifeq (${PAMH}, /usr/include/pam.h)
+ override CFLAGS += -DUSE_PAM
+ LDLIBS += -lpam -lpam_misc
+else
+ LDLIBS += -lcrypt
+endif
TARGETS=$(patsubst %.c,%,$(wildcard *.c))
@@ -25,7 +32,9 @@
install -m 555 open_init_pty $(SBINDIR)
install -m 644 run_init.8 $(MANDIR)/man8/
install -m 644 open_init_pty.8 $(MANDIR)/man8/
+ifeq (${PAMH}, /usr/include/pam.h)
install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init
+endif
clean:
-rm -f $(TARGETS) *.o
--- policycoreutils-1.26/run_init/run_init.c 2005-01-21 07:55:20.000000000 -0500
+++ policycoreutils-1.26.slack/run_init/run_init.c 2005-10-04 00:58:20.000000000 -0400
@@ -145,6 +145,7 @@
*
************************************************************************/
+#define __USE_XOPEN
#include <unistd.h> /* for getuid(), exit(), crypt() */
#include <shadow.h> /* for shadow passwd functions */
#include <string.h> /* for strlen(), memset() */
next reply other threads:[~2005-10-13 18:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-13 18:00 Timothy [this message]
2005-10-13 18:16 ` Non-PAM Policycoreutils Stephen Smalley
2005-10-13 19:18 ` Timothy
2005-10-13 19:39 ` Stephen Smalley
2005-10-13 19:56 ` Timothy
2005-10-13 20:02 ` Stephen Smalley
2005-10-13 22:11 ` Timothy
2005-10-14 15:20 ` Stephen Smalley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=434EA0C1.7050706@diyab.net \
--to=timothy@diyab.net \
--cc=SELinux@tycho.nsa.gov \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.