check 1000

user.sh

@@ -96,6 +96,7 @@ case "$1" in
         cat "${users_enabled}/${username}"
         ;;
     *)
+        BASEDIR=$(dirname $0)
         ${BASEDIR}/zjunet.sh usage
         ;;
 esac

xl2tpd.sh

@@ -131,6 +131,7 @@ case $1 in
             xl2tpd_restart
         fi
         xl2tpd_create_lac
+        xl2tpd-control add ${LAC_NAME}
         connect
         ;;
 

zjunet.sh

@@ -28,7 +28,11 @@ case "$1" in
         "${BASEDIR}/wlan.sh" $2
         ;;
     vpn)
-        sudo "${BASEDIR}/vpn.sh" $2
+        if [ $EUID -eq "0" ]; then
+            "${BASEDIR}/vpn.sh" $2
+        else
+            sudo "${BASEDIR}/vpn.sh" $2
+        fi
         ;;
     dns)
         "${BASEDIR}/dns.sh"
@@ -41,9 +45,9 @@ Usage: zjunet [ACTION]
 
 Actions:
     user
-        add            Add user
-        edit           Edit user
-        delete         Delete user
+        add            Add a user
+        edit           Edit a (enabled) user
+        delete         Delete a (enabled) user
         list           List all enabled users
         enable         Enable a user
         disable        Disable a user