Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ocserv: require hashed passwords in the config file, and a sed fix.

Browse source 
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos 2014-06-08 01:29:22 +02:00
parent 73d0cbee52
commit c40100dd86
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/ocserv/files/ocserv.init
View file

@ -53,14 +53,14 @@ setup_config() {
ipv6_addr=`echo $ip6addr|cut -d '/' -f 1` ipv6_addr=`echo $ip6addr|cut -d '/' -f 1`
ipv6_prefix=`echo $ip6addr|cut -d '/' -f 2` ipv6_prefix=`echo $ip6addr|cut -d '/' -f 2`
test $auth = "plain" && authsuffix="[/var/etc/ocpasswd]" test $auth = "plain" && authsuffix="\[/var/etc/ocpasswd\]"
mkdir -p /var/etc mkdir -p /var/etc
sed -e "s/|PORT|/$port/g" \ sed -e "s/|PORT|/$port/g" \
-e "s/|MAX_CLIENTS|/$max_clients/g" \ -e "s/|MAX_CLIENTS|/$max_clients/g" \
-e "s/|MAX_SAME|/$max_same/g" \ -e "s/|MAX_SAME|/$max_same/g" \
-e "s/|DPD|/$dpd/g" \ -e "s/|DPD|/$dpd/g" \
-e "s/|AUTH|/$auth$authsuffix/g" \ -e "s#|AUTH|#$auth$authsuffix#g" \
-e "s/|PREDICTABLE_IPS|/$predictable_ips/g" \ -e "s/|PREDICTABLE_IPS|/$predictable_ips/g" \
-e "s/|CISCO_COMPAT|/$cisco_compat/g" \ -e "s/|CISCO_COMPAT|/$cisco_compat/g" \
-e "s/|UDP|/$udp/g" \ -e "s/|UDP|/$udp/g" \
@ -74,14 +74,17 @@ setup_config() {
setup_users() { setup_users() {
local name local name
local group
local password local password
config_get name $1 name config_get name $1 name
config_get group $1 group
config_get password $1 password config_get password $1 password
[ -z "$group" ] && group='*'
[ -z "$name" -o -z "$password" ] && return [ -z "$name" -o -z "$password" ] && return
echo "$password"|ocpasswd -c /var/etc/ocpasswd "$name" echo "$name:$group:$password" >> /var/etc/ocpasswd
} }
setup_routes() { setup_routes() {
@ -165,6 +168,7 @@ start() {
rm -f /var/etc/ocpasswd rm -f /var/etc/ocpasswd
touch /var/etc/ocpasswd touch /var/etc/ocpasswd
chmod 600 /var/etc/ocpasswd
config_foreach setup_users ocservusers config_foreach setup_users ocservusers
setup_firewall config setup_firewall config