diff options
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/dnsd.c | 8 | ||||
| -rw-r--r-- | networking/interface.c | 2 | ||||
| -rw-r--r-- | networking/isrv_identd.c | 2 | ||||
| -rw-r--r-- | networking/libiproute/ip_parse_common_args.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/networking/dnsd.c b/networking/dnsd.c index cb62d20..97ba2dc 100644 --- a/networking/dnsd.c +++ b/networking/dnsd.c @@ -194,7 +194,8 @@ static int table_lookup(uint16_t type, uint8_t * as, uint8_t * qs) for (i = 1; i <= (int)(d->name[0]); i++) if (tolower(qs[i]) != d->name[i]) break; - if (i > (int)(d->name[0])) { + if (i > (int)(d->name[0]) || + (d->name[0] == 1 && d->name[1] == '*')) { strcpy((char *)as, d->ip); #if DEBUG fprintf(stderr, " OK as:%s\n", as); @@ -202,7 +203,8 @@ static int table_lookup(uint16_t type, uint8_t * as, uint8_t * qs) return 0; } } else if (type == REQ_PTR) { /* search by IP-address */ - if (!strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) { + if ((d->name[0] != 1 || d->name[1] != '*') && + !strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) { strcpy((char *)as, d->name); return 0; } @@ -401,7 +403,7 @@ int dnsd_main(int argc ATTRIBUTE_UNUSED, char **argv) r = process_packet(buf); if (r <= 0) continue; - send_to_from(udps, buf, r, 0, &to->u.sa, &from->u.sa, lsa->len); + send_to_from(udps, buf, r, 0, &from->u.sa, &to->u.sa, lsa->len); } return 0; } diff --git a/networking/interface.c b/networking/interface.c index 44bd8d3..cdd31da 100644 --- a/networking/interface.c +++ b/networking/interface.c @@ -223,7 +223,7 @@ static char *UNSPEC_print(unsigned char *ptr) char *pos; unsigned int i; - if (!buff); + if (!buff) buff = xmalloc(sizeof(struct sockaddr) * 3 + 1); pos = buff; for (i = 0; i < sizeof(struct sockaddr); i++) { diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c index d60c9fb..a96ac60 100644 --- a/networking/isrv_identd.c +++ b/networking/isrv_identd.c @@ -113,7 +113,7 @@ int fakeidentd_main(int argc ATTRIBUTE_UNUSED, char **argv) strncpy(bogouser, argv[optind], sizeof(bogouser)); /* Daemonize if no -f and no -i and no -w */ - if (!(opt & OPT_fiw)); + if (!(opt & OPT_fiw)) bb_daemonize_or_rexec(0, argv); /* Where to log in inetd modes? "Classic" inetd diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c index 294bde5..5e4012b 100644 --- a/networking/libiproute/ip_parse_common_args.c +++ b/networking/libiproute/ip_parse_common_args.c @@ -54,7 +54,7 @@ char **ip_parse_common_args(char **argv) break; } } - arg = index_in_strings(ip_common_commands, opt); + arg = index_in_substrings(ip_common_commands, opt); if (arg < 0) bb_show_usage(); if (arg == ARG_oneline) { |