aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2004-12-21 23:08:09 +0000
committerScott Ullrich <sullrich@pfsense.org>2004-12-21 23:08:09 +0000
commitb8fbd7338c1cc917770ea106cbc23839da6f3eb2 (patch)
tree53d886a810e6d0d260ae56b36fbae10e938b0276
parent66f6024d2ff5d4918e1ddc2f7023d919126a8066 (diff)
downloadpfsense-packages-b8fbd7338c1cc917770ea106cbc23839da6f3eb2.tar.gz
pfsense-packages-b8fbd7338c1cc917770ea106cbc23839da6f3eb2.tar.bz2
pfsense-packages-b8fbd7338c1cc917770ea106cbc23839da6f3eb2.zip
Update nmap. Update pure-ftpd
-rw-r--r--packages/ntop/ntop.xml4
-rw-r--r--packages/pure-ftpd.xml5
-rw-r--r--pkg_config.xml4
3 files changed, 7 insertions, 6 deletions
diff --git a/packages/ntop/ntop.xml b/packages/ntop/ntop.xml
index 23175507..57156d71 100644
--- a/packages/ntop/ntop.xml
+++ b/packages/ntop/ntop.xml
@@ -23,7 +23,7 @@
<fielddescr>NTOP Admin Password AGAIN</fielddescr>
<fieldname>passwordagain</fieldname>
<type>input</type>
- </field>
+ </field>
</fields>
<custom_add_php_command>
if($_POST['password'] == $_POST['passwordagain']) {
@@ -37,7 +37,7 @@
</custom_add_php_command>
<custom_deinstall_php_command>
mwexec("/usr/bin/killall ntop");
- </custom_deinstall_php_command>
+ </custom_deinstall_php_command>
<custom_php_install_command>
system("rm /usr/local/etc/rc.d/ntop.sh");
$fout = fopen("/usr/local/etc/rc.d/ntop.sh","w");
diff --git a/packages/pure-ftpd.xml b/packages/pure-ftpd.xml
index 6a873d79..3711829e 100644
--- a/packages/pure-ftpd.xml
+++ b/packages/pure-ftpd.xml
@@ -15,7 +15,7 @@
<adddeleteeditpagefields>
<columnitem>
<fielddescr>Username</fielddescr>
- <fieldname>graphname</fieldname>
+ <fieldname>username</fieldname>
</columnitem>
<columnitem>
<fielddescr>Description</fielddescr>
@@ -63,6 +63,7 @@
mwexec("/usr/bin/killall pure-ftpd");
</custom_deinstall_php_command>
<custom_add_php_command>
+ $expires = "";
if($_POST['expiration']) $expires = " -e " . $_POST['expiration'];
mwexec("/usr/sbin/pw useradd " . $_POST['username'] . $expires . " -m -k /home/ " . $_POST['username'] . " -s /usr/sbin/nologin");
$fd = popen("/usr/sbin/pw usermod -n " . $_POST['username'] . " -H 0", "w");
@@ -73,6 +74,6 @@
$savemsg = "User has been added.";
</custom_add_php_command>
<custom_delete_php_command>
- mwexec("/usr/sbin/pw userdel " . $_POST['username']);
+ system("/usr/sbin/pw userdel " . $username);
</custom_delete_php_command>
</packagegui>
diff --git a/pkg_config.xml b/pkg_config.xml
index 2e812d4b..38e4b49f 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -29,7 +29,7 @@
<descr>NMap is a utility for network exploration or security auditing. It supports ping scanning (determine which hosts are up), many port scanning techniques (determine what services the hosts are offering), version detection (determine what application/service is runing on a port), and TCP/IP fingerprinting (remote host OS or device identification). It also offers flexible target and port specification, decoy/stealth scanning, SunRPC scanning, and more. Most Unix and Windows platforms are supported in both GUI and command line modes. Several popular handheld devices are also supported, including the Sharp Zaurus and the iPAQ.</descr>
<category>Security</category>
<depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>
- <depends_on_package>nmap-3.70.tbz</depends_on_package>
+ <depends_on_package>nmap.tbz</depends_on_package>
<config_file>http://www.pfsense.com/packages/config/nmap.xml</config_file>
<configurationfile>nmap.xml</configurationfile>
</package>
@@ -41,6 +41,6 @@
<depends_on_package>ntop.tbz</depends_on_package>
<config_file>http://www.pfsense.com/packages/config/ntop.xml</config_file>
<configurationfile>ntop.xml</configurationfile>
- </package>
+ </package>
</packages>
</pfsensepkgs>