diff options
| author | Linus Nordberg <linus@nordu.net> | 2012-04-10 15:55:57 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2012-04-12 17:26:13 +0200 |
| commit | 8b7224cfaf6961c48c018e6cfc500d577c8caaac (patch) | |
| tree | 9b0b5b56cc4e31b084976472a874d2504167d0c9 | |
| parent | 39e90a8cfdfe5bc95d2d01aa680e328c3476ff33 (diff) | |
Don't treat exit 10 from dynamic scripts differently from any other non-zero code.
clientwr() should treat the dynamic lookup as a failure and will not
be any happier to know that the exact error was that it didn't resolv.
The script can do whatever logging is wanted.
That said, this commit also makes the scripts exit with 10 in order to
signal failure.
| -rw-r--r-- | radsecproxy.c | 11 | ||||
| -rwxr-xr-x | tools/naptr-eduroam.sh | 2 | ||||
| -rwxr-xr-x | tools/radsec-dynsrv.sh | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/radsecproxy.c b/radsecproxy.c index 5248c41..d8500c1 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -2297,14 +2297,9 @@ int dynamicconfig(struct server *server) { } if (status) { - if (WEXITSTATUS(status) == 10) { - debug(DBG_INFO, "dynamicconfig: command signals empty config"); - } - else { - debug(DBG_INFO, "dynamicconfig: command exited with status %d", - WEXITSTATUS(status)); - goto errexit; - } + debug(DBG_INFO, "dynamicconfig: command exited with status %d", + WEXITSTATUS(status)); + goto errexit; } if (ok) diff --git a/tools/naptr-eduroam.sh b/tools/naptr-eduroam.sh index 43d3d9f..6497549 100755 --- a/tools/naptr-eduroam.sh +++ b/tools/naptr-eduroam.sh @@ -70,4 +70,4 @@ if [ -n "${SERVERS}" ]; then exit 0 fi -exit 0 +exit 10 # No server found. diff --git a/tools/radsec-dynsrv.sh b/tools/radsec-dynsrv.sh index 4d00f32..3150018 100755 --- a/tools/radsec-dynsrv.sh +++ b/tools/radsec-dynsrv.sh @@ -48,4 +48,4 @@ if test -n "${SERVERS}" ; then exit 0 fi -exit 0 +exit 10 # No server found. |