- (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for

SELinux functions so they're detected correctly. Patch from pebenito at gentoo.org.
- (dtucker) [audit-bsm.c] Include errno.h. Pointed out by des at des.no.
2006-10-07 09:09:26 +10:00 · 2006-10-01 08:10:20 +10:00 · 2006-09-29 20:16:31 +10:00 · 2006-09-28 19:40:55 +10:00 · 2006-09-28 19:09:11 +10:00 · 2006-09-26 20:57:05 +10:00
4 changed files with 3019 additions and 5 deletions
@@ -1,4 +1,4 @@
-/* $Id: audit-bsm.c,v 1.4 2006/09/01 05:38:36 djm Exp $ */
+/* $Id: audit-bsm.c,v 1.4.2.1 2006/09/30 22:10:21 dtucker Exp $ */

 /*
 * TODO
@@ -39,6 +39,7 @@

 #include <sys/types.h>

+#include <errno.h>
 #include <stdarg.h>
 #include <unistd.h>

@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim Exp $
+# $Id: configure.ac,v 1.367.2.2 2006/10/06 23:09:27 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 AC_INIT(OpenSSH, Portable, [email protected])
-AC_REVISION($Revision: 1.367 $)
+AC_REVISION($Revision: 1.367.2.2 $)
 AC_CONFIG_SRCDIR([ssh.c])

 AC_CONFIG_HEADER(config.h)
@@ -1916,7 +1916,7 @@ AC_ARG_WITH(ssl-engine,
 		AC_TRY_COMPILE(
 			[ #include <openssl/engine.h>],
 			[
-int main(void){ENGINE_load_builtin_engines();ENGINE_register_all_complete();}
+ENGINE_load_builtin_engines();ENGINE_register_all_complete();
 			],
 			[ AC_MSG_RESULT(yes)
 			  AC_DEFINE(USE_OPENSSL_ENGINE, 1,
@@ -3145,7 +3145,10 @@ AC_ARG_WITH(selinux,
 		    AC_MSG_ERROR(SELinux support requires selinux.h header))
 		AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
 		    AC_MSG_ERROR(SELinux support requires libselinux library))
+		save_LIBS="$LIBS"
+		LIBS="$LIBS $LIBSELINUX"
 		AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
+		LIBS="$save_LIBS"
 	fi ]
 )
 AC_SUBST(LIBSELINUX)
@@ -36,6 +36,7 @@
 #endif
 #include <stdarg.h>
 #include <unistd.h>
+#include <signal.h>

 #include <openssl/rand.h>
 #include <openssl/crypto.h>
Author	SHA1	Message	Date
Darren Tucker	66964decfa	- (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for SELinux functions so they're detected correctly. Patch from pebenito at gentoo.org.	2006-10-07 09:09:26 +10:00
Darren Tucker	4a760096e6	- (dtucker) [audit-bsm.c] Include errno.h. Pointed out by des at des.no.	2006-10-01 08:10:20 +10:00
Darren Tucker	a4ce883a4b	- (dtucker) [configure.ac] Bug #1239 : Fix configure test for OpenSSH engine support. Patch from andrew.benham at thus net.	2006-09-29 20:16:31 +10:00
Darren Tucker	853e1535a7	- (dtucker) [entropy.c] Bug #1238 : include signal.h to fix compilation error on Solaris 8 w/out /dev/random or prngd. Patch from rl at math.technion.ac.il.	2006-09-28 19:40:55 +10:00
Darren Tucker	11d0d6ad34	Marker for 4.4p1 release	2006-09-28 19:09:11 +10:00
Darren Tucker	6518797401	- (dtucker) [sftp-server.8] Resync; spotted by djm@	2006-09-26 20:57:05 +10:00
Darren Tucker	05344402d2	- (dtucker) [bufaux.h] nuke bufaux.h; it's already gone from OpenBSD and not referenced any more. ok djm@	2006-09-26 20:54:57 +10:00