From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Tue, 15 May 2018 15:53:46 +0000 (-0600)
Subject: Depending on the bos level, AIX 6.1 may or may not include
X-Git-Tag: SUDO_1_8_24^2~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a4c0e06c1105eea216d88163ae5a8ebc3ad9913;p=sudo

Depending on the bos level, AIX 6.1 may or may not include
getline/getdelim and AIX 7.1 may or may not include memset_s.
Since we need to build packages that will work on all AIX 6.1 and
7.1 machines, use our getline() and memset_s emulation.
---

diff --git a/configure b/configure
index 5a3edb7cf..2f26c53fd 100755
--- a/configure
+++ b/configure
@@ -15452,6 +15452,18 @@ fi
 		    ac_cv_func_strnlen=no
 		fi
 
+		# getline() may or may ont be present on AIX <= 6.1.
+		# bos610 is missing getline/getdelim but bos61J has it.
+		if test $OSMAJOR -le 6; then
+		    ac_cv_func_getline=no
+		fi
+
+		# memset_s() may or may ont be present on AIX <= 7.1.
+		# bos710 is missing memset_s but bos71L has it.
+		if test $OSMAJOR -le 7; then
+		    ac_cv_func_memset_s=no
+		fi
+
 		# Remove timedir on boot, AIX does not have /var/run
 		INIT_SCRIPT=aix.sh
 		INIT_DIR=/etc/rc.d/init.d
diff --git a/configure.ac b/configure.ac
index 77e1ecd57..91eeb5d11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1818,6 +1818,18 @@ case "$host" in
 		    ac_cv_func_strnlen=no
 		fi
 
+		# getline() may or may ont be present on AIX <= 6.1.
+		# bos610 is missing getline/getdelim but bos61J has it.
+		if test $OSMAJOR -le 6; then
+		    ac_cv_func_getline=no
+		fi
+
+		# memset_s() may or may ont be present on AIX <= 7.1.
+		# bos710 is missing memset_s but bos71L has it.
+		if test $OSMAJOR -le 7; then
+		    ac_cv_func_memset_s=no
+		fi
+
 		# Remove timedir on boot, AIX does not have /var/run
 		INIT_SCRIPT=aix.sh
 		INIT_DIR=/etc/rc.d/init.d