Date: Fri, 3 Mar 2006 21:55:56 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 92695 for review Message-ID: <200603032155.k23LtuIK077677@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=92695 Change 92695 by rwatson@rwatson_zoo on 2006/03/03 21:55:14 Integrate OpenBSM change: do rely on presence of config.h. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 (text+ko) ==== @@ -30,21 +30,17 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 $ */ #include <sys/types.h> -#ifdef HAVE_CONFIG_H #include <config/config.h> #ifdef HAVE_FULL_QUEUE_H #include <sys/queue.h> #else #include <compat/queue.h> #endif -#else /* !HAVE_CONFIG_H */ -#include <sys/queue.h> -#endif /* !HAVE_CONFIG_H */ #include <bsm/audit_internal.h> #include <bsm/libbsm.h> ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 (text+ko) ==== @@ -31,12 +31,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 $ */ #include <sys/types.h> -#ifdef HAVE_CONFIG_H #include <config/config.h> #ifdef HAVE_SYS_ENDIAN_H #include <sys/endian.h> @@ -57,10 +56,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include <compat/queue.h> #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include <sys/endian.h> -#include <sys/queue.h> -#endif /* !HAVE_CONFIG_H */ #include <sys/stat.h> #include <sys/socket.h> ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 (text+ko) ==== @@ -27,21 +27,17 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 $ */ #include <sys/types.h> -#ifdef HAVE_CONFIG_H #include <config/config.h> #ifdef HAVE_FULL_QUEUE_H #include <sys/queue.h> #else /* !HAVE_FULL_QUEUE_H */ #include <compat/queue.h> #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include <sys/queue.h> -#endif /* !HAVE_CONFIG_H */ #include <bsm/libbsm.h> ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 $ */ /* @@ -34,22 +34,13 @@ */ #include <sys/types.h> -#ifdef HAVE_CONFIG_H - #include <config/config.h> - #ifdef HAVE_FULL_QUEUE_H #include <sys/queue.h> #else /* !HAVE_FULL_QUEUE_H */ #include <compat/queue.h> #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ - -#include <sys/queue.h> - -#endif /* !HAVE_CONFIG_H */ - #include <bsm/audit_internal.h> #include <bsm/libbsm.h> ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 (text+ko) ==== @@ -30,12 +30,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 $ */ #include <sys/types.h> -#ifdef HAVE_CONFIG_H #include <config/config.h> #ifdef HAVE_SYS_ENDIAN_H #include <sys/endian.h> @@ -56,10 +55,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include <compat/queue.h> #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include <sys/endian.h> -#include <sys/queue.h> -#endif /* !HAVE_CONFIG_H */ #include <sys/socket.h> #include <sys/time.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603032155.k23LtuIK077677>