diff options
Diffstat (limited to 'usr.bin/kdump')
| -rw-r--r-- | usr.bin/kdump/kdump.c | 10 | ||||
| -rw-r--r-- | usr.bin/kdump/ktrstruct.c | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index a74ca70d587..a9257581bca 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kdump.c,v 1.112 2015/10/06 03:27:25 deraadt Exp $ */ +/* $OpenBSD: kdump.c,v 1.113 2015/10/09 01:37:08 deraadt Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -241,8 +241,8 @@ main(int argc, char *argv[]) if (argc > optind) usage(); - if (tame("stdio getpw rpath", NULL) == -1) - err(1, "tame"); + if (pledge("stdio getpw rpath", NULL) == -1) + err(1, "pledge"); m = malloc(size = 1025); if (m == NULL) @@ -250,8 +250,8 @@ main(int argc, char *argv[]) if (!freopen(tracefile, "r", stdin)) err(1, "%s", tracefile); - if (tame("stdio getpw", NULL) == -1) - err(1, "tame"); + if (pledge("stdio getpw", NULL) == -1) + err(1, "pledge"); if (fread_tail(&ktr_header, sizeof(struct ktr_header), 1) == 0 || ktr_header.ktr_type != htobe32(KTR_START)) diff --git a/usr.bin/kdump/ktrstruct.c b/usr.bin/kdump/ktrstruct.c index 6adffa3ecc6..a19971ee077 100644 --- a/usr.bin/kdump/ktrstruct.c +++ b/usr.bin/kdump/ktrstruct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ktrstruct.c,v 1.11 2015/10/03 23:52:30 guenther Exp $ */ +/* $OpenBSD: ktrstruct.c,v 1.12 2015/10/09 01:37:08 deraadt Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -560,13 +560,13 @@ ktrstruct(char *buf, size_t buflen) memcpy(cmsg, data, datalen); ktrcmsghdr(cmsg, datalen); free(cmsg); - } else if (strcmp(name, "tamereq") == 0) { - printf("tame request="); - showbufc(basecol + sizeof("tame request=") - 1, + } else if (strcmp(name, "pledgereq") == 0) { + printf("pledge request="); + showbufc(basecol + sizeof("pledge request=") - 1, (unsigned char *)data, datalen); - } else if (strcmp(name, "tamepath") == 0) { - printf("tame path="); - showbufc(basecol + sizeof("tame path=") - 1, + } else if (strcmp(name, "pledgepath") == 0) { + printf("pledge path="); + showbufc(basecol + sizeof("pledge path=") - 1, (unsigned char *)data, datalen); } else { printf("unknown structure %s\n", name); |