Fix build for OpenPAM. The directories needed tweeking.

3 files changed, 2 insertions, 81 deletions

diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index c065cf4..1c31f78 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -159,7 +159,7 @@ beforeinstall:
 .endfor
 .for HEADER in ${ADD_HEADERS}
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${.CURDIR}/${HEADER} ${DESTDIR}/usr/include/security/${HEADER}
+	    ${.CURDIR}/security/${HEADER} ${DESTDIR}/usr/include/security/${HEADER}
 .endfor
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/libpam/pam_mod_misc.h b/lib/libpam/libpam/pam_mod_misc.h
deleted file mode 100644
index 5a541b2..0000000
--- a/lib/libpam/libpam/pam_mod_misc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright 1998 Juniper Networks, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$FreeBSD$
- */
-
-#ifndef PAM_MOD_MISC_H
-#define PAM_MOD_MISC_H
-
-#include <sys/cdefs.h>
-
-/* Standard options
- */
-enum opt { PAM_OPT_DEBUG, PAM_OPT_NO_WARN, PAM_OPT_ECHO_PASS,
-	PAM_OPT_USE_FIRST_PASS, PAM_OPT_TRY_FIRST_PASS, PAM_OPT_USE_MAPPED_PASS,
-	PAM_OPT_TRY_MAPPED_PASS, PAM_OPT_EXPOSE_ACCOUNT,
-	PAM_OPT_STD_MAX /* XXX */ };
-
-#define PAM_MAX_OPTIONS	32
-
-struct opttab {
-	const char *name;
-	int value;
-};
-
-struct options {
-	struct {
-		const char *name;
-		int bool;
-		char *arg;
-	} opt[PAM_MAX_OPTIONS];
-};
-
-__BEGIN_DECLS
-void	pam_std_option(struct options *, struct opttab *, int, const char **);
-int	pam_test_option(struct options *, enum opt, char **);
-void	pam_set_option(struct options *, enum opt);
-void	pam_clear_option(struct options *, enum opt);
-void	_pam_log(struct options *, const char *, const char *, const char *, ...);
-void	_pam_log_retval(struct options *, const char *, const char *, int);
-void	_pam_verbose_error(pam_handle_t *, struct options *, const char *,
-		const char *, const char *, ...);
-__END_DECLS
-
-#define	PAM_LOG(args...)						\
-	_pam_log(&options, __FILE__, __FUNCTION__, ##args)
-
-#define PAM_RETURN(arg)							\
-	do {								\
-		_pam_log_retval(&options, __FILE__, __FUNCTION__, arg);	\
-		return arg;						\
-	} while (0)
-
-#define PAM_VERBOSE_ERROR(args...)					\
-	_pam_verbose_error(pamh, &options, __FILE__, __FUNCTION__, ##args)
-
-#endif
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc
index 08a73eb..0f4efa1 100644
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@@ -5,7 +5,7 @@ PAMDIR=		${.CURDIR}/../../../../contrib/openpam
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 
-CFLAGS+=	-I${PAMDIR}/libpam/include
+CFLAGS+=	-I${PAMDIR}/include
 CFLAGS+=	-I${.CURDIR}/../../libpam
 
 # This is nasty.