diff options
| author | asmodai <asmodai@FreeBSD.org> | 2001-07-30 16:55:52 +0000 |
|---|---|---|
| committer | asmodai <asmodai@FreeBSD.org> | 2001-07-30 16:55:52 +0000 |
| commit | c25217007ca343d3c1138f765468e38626ec0c2d (patch) | |
| tree | 30ec9b6347fecc1da2511040c1ce4e1edc72dbf6 /contrib/bind/bin | |
| parent | dcb55fc8706d6ff08b4d3ffb0210c90f065d172a (diff) | |
| download | FreeBSD-src-c25217007ca343d3c1138f765468e38626ec0c2d.zip FreeBSD-src-c25217007ca343d3c1138f765468e38626ec0c2d.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/bind/bin')
| -rw-r--r-- | contrib/bind/bin/named-xfer/named-xfer.c | 14 | ||||
| -rw-r--r-- | contrib/bind/bin/nslookup/getinfo.c | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/contrib/bind/bin/named-xfer/named-xfer.c b/contrib/bind/bin/named-xfer/named-xfer.c index a1613237..4257856 100644 --- a/contrib/bind/bin/named-xfer/named-xfer.c +++ b/contrib/bind/bin/named-xfer/named-xfer.c @@ -131,7 +131,7 @@ char copyright[] = #if !defined(lint) && !defined(SABER) static const char sccsid[] = "@(#)named-xfer.c 4.18 (Berkeley) 3/7/91"; -static const char rcsid[] = "$Id: named-xfer.c,v 8.104 2000/12/23 08:14:44 vixie Exp $"; +static const char rcsid[] = "$Id: named-xfer.c,v 8.105.2.1 2001/04/26 02:56:09 marka Exp $"; #endif /* not lint */ #include "port_before.h" @@ -170,6 +170,10 @@ static const char rcsid[] = "$Id: named-xfer.c,v 8.104 2000/12/23 08:14:44 vixie #include "port_after.h" +#ifndef PATH_SEP +#define PATH_SEP '/' +#endif + #define MAIN_PROGRAM #include "../named/named.h" #undef MAIN_PROGRAM @@ -331,7 +335,7 @@ main(int argc, char *argv[]) { set42sig(); #endif memset(&axfr_src, 0, sizeof axfr_src); - ProgName = strrchr(argv[0], '/'); + ProgName = strrchr(argv[0], PATH_SEP); if (ProgName != NULL) ProgName++; else @@ -892,13 +896,13 @@ getzone(struct zoneinfo *zp, u_int32_t serial_no, int port) { (void)fprintf(ddt,"getzone() %s ", zp->z_origin); switch (zp->z_type) { case Z_STUB: - fprintf(ddt,"stub\n"); + fprintf(ddt, "stub\n"); break; case Z_SECONDARY: - fprintf(ddt,"secondary\n"); + fprintf(ddt, "slave\n"); break; default: - fprintf(ddt,"unknown type\n"); + fprintf(ddt, "unknown type\n"); } } #endif diff --git a/contrib/bind/bin/nslookup/getinfo.c b/contrib/bind/bin/nslookup/getinfo.c index a9ca56f..a5305e4 100644 --- a/contrib/bind/bin/nslookup/getinfo.c +++ b/contrib/bind/bin/nslookup/getinfo.c @@ -54,7 +54,7 @@ #ifndef lint static const char sccsid[] = "@(#)getinfo.c 5.26 (Berkeley) 3/21/91"; -static const char rcsid[] = "$Id: getinfo.c,v 8.17 2000/12/23 08:14:46 vixie Exp $"; +static const char rcsid[] = "$Id: getinfo.c,v 8.18 2001/02/27 06:03:40 vixie Exp $"; #endif /* not lint */ /* @@ -175,7 +175,7 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer) */ FreeHostInfoPtr(hostPtr); - status = SendRequest(nsAddrPtr, msg, msglen, (u_char *) &answer, + status = SendRequest(nsAddrPtr, (u_char *)msg, msglen, (u_char *) &answer, sizeof(answer), &n); if (status != SUCCESS) { |
