X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdhcpd-pools.c;h=78a6ce0bbdbd6fa2c89b6a78da7dd6d74cac08d0;hb=ee35f8bb1f94b177675ab84b963a0fe61cd201eb;hp=a27724d042e27759bd4100ec75c64e53047166d9;hpb=74aef1c34e31699595b4b198bcde5ac1af694260;p=debian%2Fdhcpd-pools.git diff --git a/src/dhcpd-pools.c b/src/dhcpd-pools.c index a27724d..78a6ce0 100644 --- a/src/dhcpd-pools.c +++ b/src/dhcpd-pools.c @@ -36,6 +36,7 @@ extern char *malloc(); #include #endif #include +#include #include "dhcpd-pools.h" #include "defaults.h" @@ -139,7 +140,7 @@ int main(int argc, char **argv) /* Output sorting option */ if (optarg != NULL) { sorts = strlen(optarg); - if (sorts > 5) { + if (5 < sorts) { eprintf ("main: only 5 first sort orders will be used"); strncpy(config.sort, optarg, @@ -262,6 +263,13 @@ int main(int argc, char **argv) } free(tmp_ranges); output_analysis(); + /* After fopen in ouput ioctl does like /dev/null which + * cause ENOTTY, and clean_up will see that without this + * reset. At least linux does this, and possibly some + * other systems. There's a report from FreeBSD 8.0 which + * matches quite well with the symptom. */ + if (errno == 25) + errno = 0; if ((config.output_format[0] == 'x') || (config.output_format[0] == 'X')) {