diff --git a/community/testing/version-11.0.0beta/opennds-filogic-11.0.0~be7a-r42.apk b/community/testing/version-11.0.0beta/opennds-filogic-11.0.0~be7a-r42.apk deleted file mode 100644 index 6ee05c2..0000000 Binary files a/community/testing/version-11.0.0beta/opennds-filogic-11.0.0~be7a-r42.apk and /dev/null differ diff --git a/community/testing/version-11.0.0beta/opennds-filogic-11.0.0~be7a-r45.apk b/community/testing/version-11.0.0beta/opennds-filogic-11.0.0~be7a-r45.apk new file mode 100644 index 0000000..2ba6b1a Binary files /dev/null and b/community/testing/version-11.0.0beta/opennds-filogic-11.0.0~be7a-r45.apk differ diff --git a/forward_authentication_service/libs/libopennds.sh b/forward_authentication_service/libs/libopennds.sh index 4d26c36..34c4a2e 100755 --- a/forward_authentication_service/libs/libopennds.sh +++ b/forward_authentication_service/libs/libopennds.sh @@ -2220,6 +2220,12 @@ get_quotas_by_mac() { # # ######################################### +formatcheck=$(cat /etc/config/opennds | grep -q -w "config opennds 'setup'"; echo $?) + +if [ "$formatcheck" -eq 1 ]; then + exit 1 +fi + querystr="$1" query_type=${querystr:0:9} diff --git a/src/util.c b/src/util.c index 1f569c4..d8be73f 100644 --- a/src/util.c +++ b/src/util.c @@ -504,11 +504,16 @@ int get_option_from_config(char* msg, int msg_len, const char *option) safe_snprintf(cmd, SMALL_BUF, "/usr/lib/opennds/libopennds.sh get_option_from_config '%s'", option); if (execute_ret_url_encoded(msg, msg_len - 1, cmd) != 0) { - debug(LOG_INFO, "Failed to get option [%s] - retrying", option); + openlog ("opennds", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_DAEMON); + syslog (LOG_ERR, "Failed to get option [%s] - retrying\n", VERSION); + closelog (); sleep(1); if (execute_ret_url_encoded(msg, msg_len - 1, cmd) != 0) { - debug(LOG_INFO, "Failed to get option [%s] - giving up", option); + openlog ("opennds", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_DAEMON); + syslog (LOG_CRIT, "Failed to get option [%s] Bad library or invalid config format - exiting\n", VERSION); + closelog (); + exit(1); } }