From b8fbd7338c1cc917770ea106cbc23839da6f3eb2 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 21 Dec 2004 23:08:09 +0000
Subject: Update nmap.  Update pure-ftpd

---
 packages/ntop/ntop.xml | 4 ++--
 packages/pure-ftpd.xml | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'packages')

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>
-- 
cgit v1.2.3