diff options
author | Phil Davis <phil.davis@inf.org> | 2014-12-07 22:41:11 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2014-12-07 22:41:11 +0545 |
commit | eca5402b32dea0b1a5ce2ebe1dee30a87d74c2d8 (patch) | |
tree | 28bb456794c878e25e741dc4ac1c7958513889c0 /etc/rc.initial.setlanip | |
parent | f3dac61c02eef19d31083c50d4de58836b61c434 (diff) | |
download | pfsense-eca5402b32dea0b1a5ce2ebe1dee30a87d74c2d8.zip pfsense-eca5402b32dea0b1a5ce2ebe1dee30a87d74c2d8.tar.gz |
Provide success return indication from console_configure_dhcpd
Recent commit https://github.com/pfsense/pfsense/commit/9ea554ee5cb25ea3bf5bb6bf7997c6c7379ce349 added testing of the return status of console_configure_dhcpd() - this let a user effectively abort from doing anything if they have answered "y" to prompt_for_enable_dhcp_server() and are being asked for the start and end of the range, and then decide they do not want to proceed.
However, even when they gave good answers, status 0 was being returned. This prevented changes ever being implemented.
Redmine: https://redmine.pfsense.org/issues/4080
The fix is to return 1 at the routine end, when all is good and the code should proceed.
Diffstat (limited to 'etc/rc.initial.setlanip')
-rwxr-xr-x | etc/rc.initial.setlanip | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index 235db52..f49cac2 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -401,6 +401,7 @@ function console_configure_dhcpd($version = 4) { $restart_dhcpd = true; } } + return 1; } if (console_configure_dhcpd(4) == 0) |