Ver.1.4.21: Modify Makefile and install manual.

diff --git a/opengate/conf/rc.firewall.sample b/opengate/conf/rc.firewall.sample
index 29decc2..c008a61 100644 (file)
--- a/opengate/conf/rc.firewall.sample
+++ b/opengate/conf/rc.firewall.sample
@@ -19,10 +19,6 @@ $fwcmd add 1 divert natd ip from any to any via ${oif}
 $fwcmd add deny all from ${inet}:${imask} to any in via ${oif}
 $fwcmd add deny all from ${onet}:${omask} to any in via ${iif}
 
-### Stop http from softeather
-$fwcmd add deny tcp from 192.168.0.0:255.255.255.0 to ${oip} 80
-$fwcmd add deny tcp from 192.168.0.0:255.255.255.0 to ${oip} 443
-
 ### Allow from / to myself
 $fwcmd add pass all from ${iip} to any via ${iif}
 $fwcmd add pass all from ${oip} to any via ${oif}

diff --git a/opengate/doc/Changes.html b/opengate/doc/Changes.html
index 7c1967f..4c7590e 100644 (file)
--- a/opengate/doc/Changes.html
+++ b/opengate/doc/Changes.html
@@ -583,6 +583,11 @@ Ver.1.4.20 at 2007.6.1</DT>
 <DD>\r
 Modify web pages to guide the users to the right way.\r
 </DD>\r
+<DT>\r
+Ver.1.4.21 at 2007.6.14</DT>\r
+<DD>\r
+Modify Makefile and install document.\r
+</DD>\r
 \r
 </DL>\r
 <b>Please see CVS in SourceForge.net to check the file difference between versions.</b>\r

diff --git a/opengate/doc/en/install.html b/opengate/doc/en/install.html
index 0072620..46a17ee 100644 (file)
--- a/opengate/doc/en/install.html
+++ b/opengate/doc/en/install.html
@@ -675,6 +675,12 @@ ErrorDocument 404 /
 </Directory>\r
 </pre></td></tr></table>\r
 \r
+<p>\r
+Remove the comment mark to enable the following setting\r
+<table><tr><td><pre>\r
+AddHandler type-map .var\r
+</pre></td></tr></table>\r
+</p>\r
 \r
 \r
 <p>Check the behavior of Apache2 by various access.</p>\r
@@ -803,10 +809,6 @@ $fwcmd add 1 divert natd ip from any to any via ${oif}
 $fwcmd add deny all from ${inet}:${imask} to any in via ${oif}\r
 $fwcmd add deny all from ${onet}:${omask} to any in via ${iif}\r
 \r
-### Stop http from softeather\r
-$fwcmd add deny tcp from 192.168.0.0:255.255.255.0 to ${oip} 80\r
-$fwcmd add deny tcp from 192.168.0.0:255.255.255.0 to ${oip} 443\r
-\r
 ### Allow from / to myself\r
 $fwcmd add pass all from ${iip} to any via ${iif}\r
 $fwcmd add pass all from ${oip} to any via ${oif}\r

diff --git a/opengate/doc/ja/install.html b/opengate/doc/ja/install.html
index fa7eb38..46d1bb8 100644 (file)
--- a/opengate/doc/ja/install.html
+++ b/opengate/doc/ja/install.html
@@ -662,6 +662,13 @@ ErrorDocument 404 /
 </pre></td></tr></table>\r
 \r
 <p>\r
+\89º\82Ì\90Ý\92è\82Ì\83R\83\81\83\93\83g\82ð\8aO\82·\81B\r
+<table><tr><td><pre>\r
+AddHandler type-map .var\r
+</pre></td></tr></table>\r
+</p>\r
+\r
+<p>\r
 \93ú\96{\8cê\82ª\89»\82¯\82é\8fê\8d\87\82É\82Í\81A\95¶\8e\9a\83Z\83b\83g\82Ì\90Ý\92è\82ð\83R\83\81\83\93\83g\83A\83E\83g\82·\82é\81B</p>\r
 \r
 <table><tr><td><pre>\r
@@ -793,10 +800,6 @@ $fwcmd add 1 divert natd ip from any to any via ${oif}
 $fwcmd add deny all from ${inet}:${imask} to any in via ${oif}\r
 $fwcmd add deny all from ${onet}:${omask} to any in via ${iif}\r
 \r
-### Stop http from softeather\r
-$fwcmd add deny tcp from 192.168.0.0:255.255.255.0 to ${oip} 80\r
-$fwcmd add deny tcp from 192.168.0.0:255.255.255.0 to ${oip} 443\r
-\r
 ### Allow from / to myself\r
 $fwcmd add pass all from ${iip} to any via ${iif}\r
 $fwcmd add pass all from ${oip} to any via ${oif}\r
@@ -949,7 +952,7 @@ local1.*  /var/log/opengate.log
 \r
 <h4>G.1&nbsp;MRTG\82Ì\83C\83\93\83X\83g\81[\83\8b<A class=anchor href="#mrtg1" name=mrtg1>\81õ</A></h4>\r
 \r
-<p>Opengate \82Ì\97\98\97p\8fó\8bµ\82ð\8aÄ\8e\8b\82·\82é\82½\82ß\82É\81AMRTG\82ð\97p\82¢\82é\82±\82Æ\82ª\89Â\94\\82Å\82 \82é\81B\97\98\97p\8fó\8bµ\82Ì\8aÄ\8e\8b\82ð\8ds\82È\82í\82È\82¢\8fê\8d\87\82Í\81A\r
+<p>\82±\82Ì\83C\83\93\83X\83g\81[\83\8b\82Í\94C\88Ó\82Å\82 \82é\81BOpengate \82Ì\97\98\97p\8fó\8bµ\82ð\8aÄ\8e\8b\82·\82é\82½\82ß\82É\81AMRTG\82ð\97p\82¢\82é\82±\82Æ\82ª\89Â\94\\82Å\82 \82é\81B\97\98\97p\8fó\8bµ\82Ì\8aÄ\8e\8b\82ð\8ds\82È\82í\82È\82¢\8fê\8d\87\82Í\81A\r
 MRTG\82Ì\83C\83\93\83X\83g\81[\83\8b\82Í\95s\97v\82Å\82 \82é\81B</p>\r
 \r
 <p>MRTG(Multi Router Traffic Grapher)\82Æ\82Í\81A\96{\97\88\83l\83b\83g\83\8f\81[\83N\82Ì\95\89\89×\82ð\8aÄ\8e\8b\82·\82é\83c\81[\83\8b\82Å\82 \82é\81B\r
@@ -1216,7 +1219,7 @@ Opengate User Counter
 <!-- Start:rulechk\82Ì\83C\83\93\83X\83g\81[\83\8b -->\r
 <h3>H.&nbsp;rulechk\82Ì\83C\83\93\83X\83g\81[\83\8b<A class=anchor href="#rulechk" name=rulechk>\81õ</A></h3>\r
 \r
-<p>Opengate\82Ì\83v\83\8d\83Z\83X\82ª\88Ù\8fí\8fI\97¹\82µ\82½\82Æ\82«\81A\8bÉ\82ß\82Ä\8bH\82É\82Å\82Í\82 \82é\82ª\81A\83t\83@\83C\83A\83E\83H\81[\83\8b\83\8b\81[\83\8b\82ª\8fÁ\82³\82ê\82¸\82É\8ec\82é\82±\82Æ\82ª\82 \82é\81B\r
+<p>\82±\82Ì\83C\83\93\83X\83g\81[\83\8b\82Í\94C\88Ó\82Å\82 \82é\81BOpengate\82Ì\83v\83\8d\83Z\83X\82ª\88Ù\8fí\8fI\97¹\82µ\82½\82Æ\82«\81A\8bÉ\82ß\82Ä\8bH\82É\82Å\82Í\82 \82é\82ª\81A\83t\83@\83C\83A\83E\83H\81[\83\8b\83\8b\81[\83\8b\82ª\8fÁ\82³\82ê\82¸\82É\8ec\82é\82±\82Æ\82ª\82 \82é\81B\r
 \82»\82Ì\82æ\82¤\82È\8fó\8bµ\82É\91Î\89\9e\82·\82é\83X\83N\83\8a\83v\83g\82ð\81Atools/rulechk\82É\97p\88Ó\82µ\82½\81BOpengateVer.1.3.1\88È\8d~\82Ì\83t\83H\81[\83}\83b\83g\82É\82Ì\82Ý\91Î\89\9e\82·\82é\81B\r
 \82±\82Ì\83c\81[\83\8b\82Í\81Aps\83R\83}\83\93\83h\82©\82ç\93¾\82ç\82ê\82éOpengate\83v\83\8d\83Z\83X\88ê\97\97\82Æ\81A\83t\83@\83C\83A\83E\83H\81[\83\8b\82©\82ç\93¾\82ç\82ê\82é\8b\96\89Â\83\8b\81[\83\8b\88ê\97\97\82ð\94ä\8ar\82µ\82Ä\81A\r
 \97]\95ª\82È\83\8b\81[\83\8b\82ð\8dí\8f\9c\82·\82é\83X\83N\83\8a\83v\83g\82Å\82 \82é\81B\r

diff --git a/opengate/opengatesrv/Makefile b/opengate/opengatesrv/Makefile
index bc8fa3d..8b89a43 100644 (file)
--- a/opengate/opengatesrv/Makefile
+++ b/opengate/opengatesrv/Makefile
@@ -13,7 +13,13 @@ INSTALLDOCPATH = ${WWWTOP}${DOCDIR}${OPENGATEDIR}
 INSTALLCGIPATH = ${WWWTOP}${CGIDIR}${OPENGATEDIR}
 
 CFLAGS= -O4 -Wall
-LIBS = -lssl -lcrypto -lradius -lpam -lldap -llber -lezxml -L/usr/local/lib -L../ezxml
+
+.if exists(/usr/local/include/ldap.h)
+LIBS = -lssl -lcrypto -lradius -lpam -lezxml -L../ezxml -lldap -llber -L/usr/local/lib
+.else
+LIBS = -lssl -lcrypto -lradius -lpam -lezxml -L../ezxml
+.endif
+
 OBJS = utilities.o comm-auth.o comm-cgi.o watch-client.o comm-ipfw.o comm-ip6fw.c comm-arp.o comm-ndp.o error.o tcp_connect.o sock_ntop_host.o wrapper.o signal.o auth-pam.o auth-rad.o auth-pop3s.o comm-userdb.o get-param.o auth-ftps.o auth-ldap.o htmltemplate.o addr-convert.o get-mac.o ctrl-firewall.o ctrl-alarms.o
 MAINPROGO = main.o
 HDRS = opengatesrv.h