diff options
author | Dan Egnor <egnor@google.com> | 2009-05-18 23:55:58 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-18 23:55:58 -0700 |
commit | 842ca81ded8edfbb23e9554d1bc1b88f7d69b2ea (patch) | |
tree | 87573d5a9625bdeb883d2364c3653785857eb7de | |
parent | 4bc8c3e969bd0663386d9028897145e6b5e8017f (diff) | |
parent | ae21bd0d82ab0b179d661f0c779e633b75bb4474 (diff) | |
download | tcpdump-842ca81ded8edfbb23e9554d1bc1b88f7d69b2ea.tar.gz |
am ae21bd0d: Move tcpdump to /system/xbin (instead of /system/bin), and configure it to shed privileges by default (if running as root) after binding the socket needed to sniff with.
Merge commit 'ae21bd0d82ab0b179d661f0c779e633b75bb4474'
* commit 'ae21bd0d82ab0b179d661f0c779e633b75bb4474':
Move tcpdump to /system/xbin (instead of /system/bin),
-rw-r--r-- | Android.mk | 16 | ||||
-rw-r--r-- | config.h | 2 |
2 files changed, 10 insertions, 8 deletions
@@ -119,20 +119,22 @@ LOCAL_SRC_FILES:=\ missing/strlcat.c\ missing/strlcpy.c -LOCAL_CFLAGS:=-O2 -g -LOCAL_CFLAGS+=-DHAVE_CONFIG_H -D_U_="__attribute__((unused))" +LOCAL_CFLAGS := -O2 -g +LOCAL_CFLAGS += -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -LOCAL_C_INCLUDES+=\ +LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/missing\ external/openssl/include\ external/libpcap -LOCAL_SHARED_LIBRARIES+=libssl +LOCAL_SHARED_LIBRARIES += libssl -LOCAL_STATIC_LIBRARIES+=libpcap +LOCAL_STATIC_LIBRARIES += libpcap -LOCAL_MODULE_TAGS:=tests +LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) -LOCAL_MODULE:=tcpdump +LOCAL_MODULE_TAGS := tests + +LOCAL_MODULE := tcpdump include $(BUILD_EXECUTABLE) @@ -131,7 +131,7 @@ /* #undef HAVE_NETDNET_DNETDB_H_DNET_HTOA */ /* define if should drop privileges by default */ -/* #undef WITH_USER */ +#define WITH_USER "shell" /* define if should chroot when dropping privileges */ /* #undef WITH_CHROOT */ |