--- /usr/portage/net-analyzer/ntop/files/ntop-init	2003-05-04 16:31:39.000000000 +0200
+++ ntop-init	2006-10-05 12:30:13.000000000 +0200
@@ -4,7 +4,16 @@
         need net
 }
 
+checkconfig() {
+        if [ ! -e /var/lib/ntop/ntop_pw.db ]; then
+		eerror "You need to set a password first by running"
+		eerror "ntop --set-admin-password"
+		return 1
+	fi
+}
+
 start() {
+	checkconfig || return 1
 	ebegin "Starting ntop"
 	start-stop-daemon --start --quiet --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS} >/dev/null
 	eend $?
@@ -12,6 +21,6 @@
 
 stop() {
 	ebegin "Stopping ntop"
-	start-stop-daemon --stop --quiet --retry 5 --exec /usr/bin/ntop
+	start-stop-daemon --stop --quiet --retry 5 --pidfile /var/lib/ntop/ntop.pid
 	eend $?
 }