Projet

Général

Profil

« Précédent | Suivant » 

Révision 30c591d6

Ajouté par Ermal il y a plus de 9 ans

Use proper path to setkey now that ipsec-tools are not used anymore

Voir les différences:

etc/inc/ipsec.inc
29 29
	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
	POSSIBILITY OF SUCH DAMAGE.
31 31

  
32
	pfSense_BUILDER_BINARIES:	/usr/local/sbin/setkey
32
	pfSense_BUILDER_BINARIES:	/sbin/setkey
33 33
	pfSense_MODULE:	ipsec
34 34

  
35 35
*/
......
498 498
 */
499 499
function ipsec_dump_spd()
500 500
{
501
	$fd = @popen("/usr/local/sbin/setkey -DP", "r");
501
	$fd = @popen("/sbin/setkey -DP", "r");
502 502
	$spd = array();
503 503
	if ($fd) {
504 504
		while (!feof($fd)) {
......
548 548
 */
549 549
function ipsec_dump_sad()
550 550
{
551
	$fd = @popen("/usr/local/sbin/setkey -D", "r");
551
	$fd = @popen("/sbin/setkey -D", "r");
552 552
	$sad = array();
553 553
	if ($fd) {
554 554
		while (!feof($fd)) {
usr/local/www/diag_ipsec_spd.php
32 32
*/
33 33

  
34 34
/*
35
	pfSense_BUILDER_BINARIES:	/usr/local/sbin/setkey
35
	pfSense_BUILDER_BINARIES:	/sbin/setkey
36 36
	pfSense_MODULE:	ipsec
37 37
*/
38 38

  
......
52 52

  
53 53
/* delete any SP? */
54 54
if ($_GET['act'] == "del") {
55
	$fd = @popen("/usr/local/sbin/setkey -c > /dev/null 2>&1", "w");
55
	$fd = @popen("/sbin/setkey -c > /dev/null 2>&1", "w");
56 56
	if ($fd) {
57 57
		fwrite($fd, "spddelete {$_GET['srcid']} {$_GET['dstid']} any -P {$_GET['dir']} ;\n");
58 58
		pclose($fd);
usr/local/www/status.php
29 29
	POSSIBILITY OF SUCH DAMAGE.
30 30
*/
31 31
/*
32
	pfSense_BUILDER_BINARIES:	/usr/bin/vmstat	/usr/bin/netstat	/sbin/dmesg	/sbin/mount	/usr/local/sbin/setkey	/usr/local/sbin/pftop	
32
	pfSense_BUILDER_BINARIES:	/usr/bin/vmstat	/usr/bin/netstat	/sbin/dmesg	/sbin/mount	/sbin/setkey	/usr/local/sbin/pftop	
33 33
	pfSense_BUILDER_BINARIES:	/sbin/pfctl	/sbin/sysctl	/usr/bin/top	/usr/bin/netstat	/sbin/pfctl	/sbin/ifconfig
34 34
	pfSense_MODULE:	support
35 35
*/
......
180 180
defCmdT("df","/bin/df");
181 181

  
182 182
defCmdT("racoon.conf","cat /var/etc/racoon.conf");
183
defCmdT("SPD","/usr/local/sbin/setkey -DP");
184
defCmdT("SAD","/usr/local/sbin/setkey -D");
183
defCmdT("SPD","/sbin/setkey -DP");
184
defCmdT("SAD","/sbin/setkey -D");
185 185

  
186 186
if(isset($config['system']['usefifolog']))  {
187 187
	defCmdT("last 200 system log entries","/usr/sbin/fifolog_reader /var/log/system.log 2>&1 | tail -n 200");

Formats disponibles : Unified diff