diff options
| author | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2017-09-21 14:41:41 +0000 |
|---|---|---|
| committer | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2017-09-21 14:41:41 +0000 |
| commit | 2560d18180bb351214175a0cd0ff518ae6c2ab96 (patch) | |
| tree | 8f93335cbd7c4a0e2c125da275e04829f2cd779a /usr.bin | |
| parent | 6d2e5f3ddfa6777cd4925c57cd043950d047116a (diff) | |
Notes
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/kdump/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/kdump/kdump.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index c91704efdeda..e1b9d4fd68a2 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -14,7 +14,7 @@ LIBADD= sysdecode LIBADD+= casper LIBADD+= cap_grp LIBADD+= cap_pwd -CFLAGS+=-DHAVE_LIBCASPER +CFLAGS+=-DWITH_CASPER .endif #NO_WERROR?= YES diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 005fdefc5508..986c7fe78acd 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include <sys/un.h> #include <sys/queue.h> #include <sys/wait.h> -#ifdef HAVE_LIBCASPER +#ifdef WITH_CASPER #include <sys/nv.h> #endif #include <arpa/inet.h> @@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$"); #include <vis.h> #include "ktrace.h" -#ifdef HAVE_LIBCASPER +#ifdef WITH_CASPER #include <libcasper.h> #include <casper/cap_grp.h> @@ -164,7 +164,7 @@ struct proc_info static TAILQ_HEAD(trace_procs, proc_info) trace_procs; -#ifdef HAVE_LIBCASPER +#ifdef WITH_CASPER static cap_channel_t *cappwd, *capgrp; #endif @@ -193,7 +193,7 @@ localtime_init(void) (void)localtime(<ime); } -#ifdef HAVE_LIBCASPER +#ifdef WITH_CASPER static int cappwdgrp_setup(cap_channel_t **cappwdp, cap_channel_t **capgrpp) { @@ -235,7 +235,7 @@ cappwdgrp_setup(cap_channel_t **cappwdp, cap_channel_t **capgrpp) *capgrpp = capgrploc; return (0); } -#endif /* HAVE_LIBCASPER */ +#endif /* WITH_CASPER */ static void print_integer_arg(const char *(*decoder)(int), int value) @@ -443,7 +443,7 @@ main(int argc, char *argv[]) strerror_init(); localtime_init(); -#ifdef HAVE_LIBCASPER +#ifdef WITH_CASPER if (resolv != 0) { if (cappwdgrp_setup(&cappwd, &capgrp) < 0) { cappwd = NULL; @@ -1874,7 +1874,7 @@ ktrstat(struct stat *statp) if (resolv == 0) { pwd = NULL; } else { -#ifdef HAVE_LIBCASPER +#ifdef WITH_CASPER if (cappwd != NULL) pwd = cap_getpwuid(cappwd, statp->st_uid); else @@ -1888,7 +1888,7 @@ ktrstat(struct stat *statp) if (resolv == 0) { grp = NULL; } else { -#ifdef HAVE_LIBCASPER +#ifdef WITH_CASPER if (capgrp != NULL) grp = cap_getgrgid(capgrp, statp->st_gid); else |