diff options
| author | Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> | 2001-07-30 16:55:52 +0000 |
|---|---|---|
| committer | Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> | 2001-07-30 16:55:52 +0000 |
| commit | 84f77e557eef9c5c238f87a10e78e1a74b307719 (patch) | |
| tree | 30ec9b6347fecc1da2511040c1ce4e1edc72dbf6 /contrib/bind/bin/named-xfer/named-xfer.c | |
| parent | e316afc606eda0420f1e1e29e630d7e25791a2b7 (diff) | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=80653
Diffstat (limited to 'contrib/bind/bin/named-xfer/named-xfer.c')
| -rw-r--r-- | contrib/bind/bin/named-xfer/named-xfer.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/contrib/bind/bin/named-xfer/named-xfer.c b/contrib/bind/bin/named-xfer/named-xfer.c index a16132375477..4257856b7840 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 |