Merge korg/donut into korg/master
diff --git a/Android.mk b/Android.mk
index 0985b10..bf2e4ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -119,20 +119,22 @@
 	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 := eng
+
+LOCAL_MODULE := tcpdump
 
 include $(BUILD_EXECUTABLE)
diff --git a/config.h b/config.h
index 76ba53b..6cc6d75 100644
--- a/config.h
+++ b/config.h
@@ -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 */