somebody started to set a function returncode in the validation
stuff and everybody copies it, e.g.
myfunction()
{
fire_command
return $?
}
a function automatically returns with the last returncode,
so we can safely remove the command 'return $?'. reference:
http://tldp.org/LDP/abs/html/exit-status.html
"The last command executed in the function or script determines the exit status."
Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
SVN-Revision: 42278
'buffersize:uinteger' \
'timezone:string:UTC' \
'zonename:string'
'buffersize:uinteger' \
'timezone:string:UTC' \
'zonename:string'
'dest_ip:cidr' \
'dest_port:or(port, portrange)' \
'target:or("SNAT", "DNAT")'
'dest_ip:cidr' \
'dest_port:or(port, portrange)' \
'target:or("SNAT", "DNAT")'
}
validate_firewall_rule()
}
validate_firewall_rule()
'src_port:or(port, portrange)' \
'dest_port:or(port, portrange)' \
'target:string'
'src_port:or(port, portrange)' \
'dest_port:or(port, portrange)' \
'target:string'
'atmdev:uinteger:0' \
'encaps:or("llc", "vc"):llc' \
'payload:or("bridged", "routed"):bridged'
'atmdev:uinteger:0' \
'encaps:or("llc", "vc"):llc' \
'payload:or("bridged", "routed"):bridged'
}
validate_route_section()
}
validate_route_section()
'metric:uinteger' \
'mtu:uinteger' \
'table:or(range(0,65535),string)'
'metric:uinteger' \
'mtu:uinteger' \
'table:or(range(0,65535),string)'
}
validate_route6_section()
}
validate_route6_section()
'metric:uinteger' \
'mtu:uinteger' \
'table:or(range(0,65535),string)'
'metric:uinteger' \
'mtu:uinteger' \
'table:or(range(0,65535),string)'
}
validate_rule_section()
}
validate_rule_section()
'lookup:or(range(0,65535),string)' \
'goto:range(0,65535)' \
'action:or("prohibit", "unreachable", "blackhole", "throw")'
'lookup:or(range(0,65535),string)' \
'goto:range(0,65535)' \
'action:or("prohibit", "unreachable", "blackhole", "throw")'
}
validate_rule6_section()
}
validate_rule6_section()
'lookup:or(range(0,65535),string)' \
'goto:range(0,65535)' \
'action:or("prohibit", "unreachable", "blackhole", "throw")'
'lookup:or(range(0,65535),string)' \
'goto:range(0,65535)' \
'action:or("prohibit", "unreachable", "blackhole", "throw")'
}
validate_switch_section()
}
validate_switch_section()
'enable:bool' \
'enable_vlan:bool' \
'reset:bool'
'enable:bool' \
'enable_vlan:bool' \
'reset:bool'
'device:string' \
'vlan:uinteger' \
'ports:list(ports)'
'device:string' \
'vlan:uinteger' \
'ports:list(ports)'
'Port:list(port):22' \
'SSHKeepAlive:uinteger:300' \
'IdleTimeout:uinteger:0'
'Port:list(port):22' \
'SSHKeepAlive:uinteger:300' \
'IdleTimeout:uinteger:0'
'table:range(0, 65535):16800' \
'forward_bcast:bool:1' \
'forward_dhcp:bool:1'
'table:range(0, 65535):16800' \
'forward_bcast:bool:1' \
'forward_dhcp:bool:1'
'log_port:port:514' \
'log_proto:or("tcp", "udp"):udp' \
'log_prefix:string'
'log_port:port:514' \
'log_proto:or("tcp", "udp"):udp' \
'log_prefix:string'
uci_validate_section system system "${1}" \
'log_size:uinteger:0' \
'log_buffer_size:uinteger:0'
uci_validate_section system system "${1}" \
'log_size:uinteger:0' \
'log_buffer_size:uinteger:0'
validate_ntp_section() {
uci_validate_section system timeserver "${1}" \
'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0'
validate_ntp_section() {
uci_validate_section system timeserver "${1}" \
'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0'