PERFORCE change 163249 for review

[Ana Kukec]

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

Change 163249 by anchie at anchie_malimis on 2009/06/01 11:04:48

		Patched, ready for compiling.		

Affected files ...

.. //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#2 edit
.. //depot/projects/soc2009/anchie_send/send_0.2/include/pkixip_ext_asn.h#2 edit
.. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#2 edit
.. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/sendd#2 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#2 (text+ko) ====

@@ -4,8 +4,8 @@
 #
 
 # Uncomment the line for your OS
-OS=linux
-#OS=freebsd
+#OS=linux
+OS=freebsd
 
 # Linux only: Where is your linux kernel source?
 # Ignored for non-Linux
@@ -19,7 +19,7 @@
 #CC=gcc-4.0
 
 # Where to install
-prefix=/usr
+prefix=/usr/local
 
 # Set to "y" to build MT versions of sendd and cgatool
 USE_THREADS=n
@@ -40,8 +40,8 @@
 USE_CONSOLE=y
 
 # Enable for debugging
-#DEBUG_POLICY= DEBUG
-DEBUG_POLICY= NO_DEBUG
+DEBUG_POLICY= DEBUG
+#DEBUG_POLICY= NO_DEBUG
 
 # enable for timestamp output on some crypto operations
 LOG_TIMESTAMP=n

==== //depot/projects/soc2009/anchie_send/send_0.2/include/pkixip_ext_asn.h#2 (text+ko) ====

@@ -45,6 +45,7 @@
 #define	IANA_SAFI_BOTH		3
 #define	IANA_SAFI_MPLS		4
 
+/*
 typedef struct IPAddressRange_st {
 	ASN1_BIT_STRING		*min;
 	ASN1_BIT_STRING		*max;
@@ -78,6 +79,12 @@
 	ASN1_OCTET_STRING	*addressFamily;
 	IPAddressChoice		*ipAddressChoice;
 } IPAddressFamily;
+*/
+
+#define IP_AOR_PREFIX		0
+#define IP_AOR_RANGE		1
+#define IPA_CHOICE_INHERIT	0
+#define IPA_CHOICE_AOR		1
 
 typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
 

==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#2 (text+ko) ====

@@ -1,7 +1,8 @@
 
 OBJS += os/addr.o os/snd_freebsd.o os/netgraph.o os-linux/rand.o
+CPPFLAGS +=	-I/usr/local/include
 
-OSLIBS= -lnetgraph -l$(DNET)
+OSLIBS= -lnetgraph -L/usr/local/lib -l$(DNET)
 
 OSEXTRA= os/sendd
 EXTRAINSTALL= /etc/rc.d/sendd

==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/sendd#2 (text+ko) ====

@@ -37,8 +37,8 @@
 
 name="sendd"
 rcvar=`set_rcvar`
-command="/usr/sbin/${name}"
-required_files="/etc/${name}.conf"
+command="/usr/local/sbin/${name}"
+required_files="/usr/local/etc/${name}.conf"
 
 load_rc_config $name
 run_rc_command "$1"