Commit: 945092bfb1a805451cfc7e5ad5ce3fa56df10058 - external-busybox (git)

external/busybox

Commit MetaInfo

• Révision: 945092bfb1a805451cfc7e5ad5ce3fa56df10058 (tree)
• l'heure: 2017-09-08 20:30:00
• Auteur: Chih-Wei Huang <cw_huang@asus...>
• Commiter: Chih-Wei Huang

Message de Log

Fix building issues on Android 8.0

Change Summary

• modified: android/selinux/android_selinux.h
• modified: networking/nslookup.c
• modified: selinux/sestatus.c

Modification

--- a/android/selinux/android_selinux.h
+++ b/android/selinux/android_selinux.h
@@ -133,15 +133,6 @@ extern int selinux_check_passwd_access(access_vector_t requested);
 
 #define selinux_policy_root() "/sepolicy"
 
-static int selinux_getenforcemode(int *rc)
-{
-	if (rc) {
-		*rc = security_getenforce();
-		return 0;
-	}
-	return -1;
-}
-
 static const char *selinux_file_contexts_path()
 {
 	return "/file_contexts";

--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -33,8 +33,10 @@
 # if ENABLE_FEATURE_IPV6
 #  include <netinet/in6.h>
 # endif
-# define ANDROID_CHANGES
 # ifdef BIONIC_L
+#  ifndef BIONIC_O
+#   define ANDROID_CHANGES
+#  endif
 #  include <arpa/nameser.h>
 #  include <dns/include/resolv_private.h>
 #  include <dns/resolv/res_private.h>

--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -23,6 +23,15 @@ extern char *selinux_mnt;
 
 #define COL_FMT  "%-31s "
 
+static int internal_selinux_getenforcemode(int *rc)
+{
+	if (rc) {
+		*rc = security_getenforce();
+		return 0;
+	}
+	return -1;
+}
+
 static void display_boolean(void)
 {
 	char **bools;
@@ -181,7 +190,7 @@ int sestatus_main(int argc UNUSED_PARAM, char **argv)
 	       rc == 0 ? "permissive" : "enforcing");
 
 	/* Mode from config file: line */
-	if (selinux_getenforcemode(&rc) != 0)
+	if (internal_selinux_getenforcemode(&rc) != 0)
 		goto error;
 	printf(COL_FMT "%s\n", "Mode from config file:",
 	       rc < 0 ? "disabled" : (rc == 0 ? "permissive" : "enforcing"));