Date: Sat, 16 Jan 1999 03:47:47 -0500 (EST) From: John Baldwin <jobaldwi@vt.edu> To: freebsd-small@FreeBSD.ORG Subject: Got a bit farther this time... :) Message-ID: <XFMail.990116034747.jobaldwi@vt.edu>
next in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE-----
Thanks for ya'lls patience,
I still can't get the net/ floppy to build yet, but I did get my clone floppy
to succesfully build. I even got a statically compiled dhcp client on it as
well. Thanks for the help.
Below are the patches to a) login.c to make PAM optionable and b) the revised
patch for the Makefile in usr.bin/login (net/crunch1/login.diff replacement)
a)
- -----
- --- login.c.orig Fri Jan 15 16:20:54 1999
+++ login.c Fri Jan 15 16:30:26 1999
@@ -77,8 +77,10 @@
#include <unistd.h>
#include <utmp.h>
+#ifndef NO_PAM
#include <security/pam_appl.h>
#include <security/pam_misc.h>
+#endif /* NO_PAM */
#include "pathnames.h"
@@ -96,7 +98,9 @@
int login_access __P((char *, char *));
void login_fbtab __P((char *, uid_t, gid_t));
+#ifndef NO_PAM
static int auth_pam __P((void));
+#endif /* NO_PAM */
static int auth_traditional __P((void));
extern void login __P((struct utmp *));
static void usage __P((void));
@@ -294,16 +298,19 @@
(void)setpriority(PRIO_PROCESS, 0, -4);
+#ifndef NO_PAM
/*
* Try to authenticate using PAM. If a PAM system error
* occurs, perhaps because of a botched configuration,
* then fall back to using traditional Unix authentication.
*/
if ((rval = auth_pam()) == -1)
+#endif /* NO_PAM */
rval = auth_traditional();
(void)setpriority(PRIO_PROCESS, 0, 0);
+#ifndef NO_PAM
/*
* PAM authentication may have changed "pwd" to the
* entry for the template user. Check again to see if
@@ -311,6 +318,7 @@
*/
if (pwd != NULL && pwd->pw_uid == 0)
rootlogin = 1;
+#endif /* NO_PAM */
ttycheck:
/*
@@ -613,6 +621,7 @@
return rval;
}
+#ifndef NO_PAM
/*
* Attempt to authenticate the user using PAM. Returns 0 if the user is
* authenticated, or 1 if not authenticated. If some sort of PAM system
@@ -694,6 +703,7 @@
}
return rval;
}
+#endif /* NO_PAM */
static void
usage()
- -----
b)
- -----
- --- Makefile.orig Fri Jan 15 16:29:29 1999
+++ Makefile Fri Jan 15 16:29:46 1999
@@ -6,10 +6,10 @@
MAN5= login.access.5
SRCS= login.c login_access.c login_fbtab.c
- -CFLAGS+=-Wall -DLOGIN_ACCESS -DLOGALL
+CFLAGS+=-Wall -DNO_PAM
DPADD= ${LIBUTIL} ${LIBCRYPT} ${LIBPAM}
- -LDADD= -lutil -lcrypt -lpam
+LDADD= -lutil -lcrypt
NOSHARED=no
BINMODE=4555
- -----
Thanks again for all the help.
- ---
John Baldwin <jobaldwi@vt.edu> -- http://members.freedomnet.com/~jbaldwin/
PGP Key: http://members.freedomnet.com/~jbaldwin/pgpkey.asc
-----BEGIN PGP SIGNATURE-----
Version: 2.6.2
iQCVAwUBNqBSCLaE8XzBCodNAQHjvwP/YR15KhozfuegyDtB8IeQAXPuX+7XDNPA
FRQHtFWzlG8AlaNwTeDPSi0Oy9iL1wCvFwXlcRxrc29SY0reF/hu9j0O7Bdx/0xd
ieryknroCSTDEpOyMMh9yygqphSCFfrg158fCgA4hRXTbxiUX8OLhdacmK1rNdB4
hovmLeIEtHQ=
=Okp6
-----END PGP SIGNATURE-----
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-small" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.990116034747.jobaldwi>