PERFORCE change 92694 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=92694

Change 92694 by rwatson at rwatson_zoo on 2006/03/03 21:51:17

	Assume that config.h will be present; don't attempt to provide
	FreeBSD default includes when HAVE_CONFIG_H isn't defined.  While
	we can do the includes without config.h, the conditionally
	compiled system call code works best with a config.h, so we'll
	want to provide a configured config.h in the FreeBSD vendor
	import, similar to the approach taken in OpenSSH.  This mildly
	de-obfuscates the includes here also.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 (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/openbsm/libbsm/bsm_audit.c#21 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 $
  */
 
 #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/openbsm/libbsm/bsm_io.c#34 (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/openbsm/libbsm/bsm_io.c#33 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 $
  */
 
 #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/openbsm/libbsm/bsm_mask.c#13 (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/openbsm/libbsm/bsm_mask.c#12 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#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/libbsm.h>
 

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 (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/openbsm/libbsm/bsm_notify.c#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 $
  */
 
 /*
@@ -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/openbsm/libbsm/bsm_token.c#42 (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/openbsm/libbsm/bsm_token.c#41 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 $
  */
 
 #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>