build: consistently include config.h unconditionally

Given that in most places config.h is included unconditionally,
there is no point in keeping remaining HAVE_CONFIG_H checks.

Public header files do not use config.h and therefore
are not affected by this change anyway.

46 files changed, 7 insertions, 101 deletions

diff --git a/conf/pam_conv1/pam_conv_l.l b/conf/pam_conv1/pam_conv_l.l
index db5ab6b9..06fc3202 100644
--- a/conf/pam_conv1/pam_conv_l.l
+++ b/conf/pam_conv1/pam_conv_l.l
@@ -9,9 +9,7 @@
  * distributed with this file.)
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/conf/pam_conv1/pam_conv_y.y b/conf/pam_conv1/pam_conv_y.y
index a800cebc..b36351cd 100644
--- a/conf/pam_conv1/pam_conv_y.y
+++ b/conf/pam_conv1/pam_conv_y.y
@@ -9,9 +9,7 @@
  * distributed with this file.)
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 #include <stdio.h>
diff --git a/doc/specs/parse_l.l b/doc/specs/parse_l.l
index d8400a07..0edc08d7 100644
--- a/doc/specs/parse_l.l
+++ b/doc/specs/parse_l.l
@@ -1,7 +1,5 @@
 %{
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
diff --git a/doc/specs/parse_y.y b/doc/specs/parse_y.y
index 96809cd2..9dbd1022 100644
--- a/doc/specs/parse_y.y
+++ b/doc/specs/parse_y.y
@@ -1,8 +1,6 @@
 
 %{
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libpam/include/test_assert.h b/libpam/include/test_assert.h
index 467f52b6..879f5814 100644
--- a/libpam/include/test_assert.h
+++ b/libpam/include/test_assert.h
@@ -7,9 +7,7 @@
 #ifndef TEST_ASSERT_H
 # define TEST_ASSERT_H
 
-# ifdef HAVE_CONFIG_H
-#  include <config.h>
-# endif
+# include <config.h>
 
 # include <limits.h>
 # include <stdio.h>
diff --git a/modules/pam_echo/pam_echo.c b/modules/pam_echo/pam_echo.c
index 6a7c2f64..5a882028 100644
--- a/modules/pam_echo/pam_echo.c
+++ b/modules/pam_echo/pam_echo.c
@@ -33,9 +33,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(HAVE_CONFIG_H)
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c
index c3ecb248..e328be16 100644
--- a/modules/pam_exec/pam_exec.c
+++ b/modules/pam_exec/pam_exec.c
@@ -33,9 +33,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(HAVE_CONFIG_H)
 #include "config.h"
-#endif
 
 #include <time.h>
 #include <errno.h>
diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c
index d291761b..512688d1 100644
--- a/modules/pam_pwhistory/opasswd.c
+++ b/modules/pam_pwhistory/opasswd.c
@@ -34,9 +34,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(HAVE_CONFIG_H)
 #include <config.h>
-#endif
 
 #include <pwd.h>
 #include <shadow.h>
diff --git a/modules/pam_pwhistory/pam_pwhistory.c b/modules/pam_pwhistory/pam_pwhistory.c
index e43bd9b2..6a720927 100644
--- a/modules/pam_pwhistory/pam_pwhistory.c
+++ b/modules/pam_pwhistory/pam_pwhistory.c
@@ -37,9 +37,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(HAVE_CONFIG_H)
 #include <config.h>
-#endif
 
 #include <pwd.h>
 #include <errno.h>
diff --git a/tests/tst-dlopen.c b/tests/tst-dlopen.c
index 00e14543..cba3e9a8 100644
--- a/tests/tst-dlopen.c
+++ b/tests/tst-dlopen.c
@@ -7,9 +7,7 @@
    (at your option) any later version.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <dlfcn.h>
 #include <stdio.h>
diff --git a/tests/tst-pam_acct_mgmt.c b/tests/tst-pam_acct_mgmt.c
index 1e8c4b4d..b355a97b 100644
--- a/tests/tst-pam_acct_mgmt.c
+++ b/tests/tst-pam_acct_mgmt.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_authenticate.c b/tests/tst-pam_authenticate.c
index 1d43ec3a..366a4b19 100644
--- a/tests/tst-pam_authenticate.c
+++ b/tests/tst-pam_authenticate.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_chauthtok.c b/tests/tst-pam_chauthtok.c
index 37ed83d3..5cf9a7e3 100644
--- a/tests/tst-pam_chauthtok.c
+++ b/tests/tst-pam_chauthtok.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_close_session.c b/tests/tst-pam_close_session.c
index 86187bb9..9954b75d 100644
--- a/tests/tst-pam_close_session.c
+++ b/tests/tst-pam_close_session.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_end.c b/tests/tst-pam_end.c
index d79df7c6..902ae717 100644
--- a/tests/tst-pam_end.c
+++ b/tests/tst-pam_end.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_fail_delay.c b/tests/tst-pam_fail_delay.c
index f166ec0d..0126af93 100644
--- a/tests/tst-pam_fail_delay.c
+++ b/tests/tst-pam_fail_delay.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_get_item.c b/tests/tst-pam_get_item.c
index c6e3d9fa..cfb2a326 100644
--- a/tests/tst-pam_get_item.c
+++ b/tests/tst-pam_get_item.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_get_user.c b/tests/tst-pam_get_user.c
index 16f31236..916c6cc6 100644
--- a/tests/tst-pam_get_user.c
+++ b/tests/tst-pam_get_user.c
@@ -31,10 +31,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <config.h>
 
 #include <stdio.h>
diff --git a/tests/tst-pam_getenvlist.c b/tests/tst-pam_getenvlist.c
index d6abac91..4e90c0ca 100644
--- a/tests/tst-pam_getenvlist.c
+++ b/tests/tst-pam_getenvlist.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_mkargv.c b/tests/tst-pam_mkargv.c
index 17a5a854..25d07cc4 100644
--- a/tests/tst-pam_mkargv.c
+++ b/tests/tst-pam_mkargv.c
@@ -6,9 +6,7 @@
    the Free Software Foundation in version 2 of the License.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/tst-pam_open_session.c b/tests/tst-pam_open_session.c
index 771ca35c..5ff91b87 100644
--- a/tests/tst-pam_open_session.c
+++ b/tests/tst-pam_open_session.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_set_item.c b/tests/tst-pam_set_item.c
index 607fbf28..b7f21fbc 100644
--- a/tests/tst-pam_set_item.c
+++ b/tests/tst-pam_set_item.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_setcred.c b/tests/tst-pam_setcred.c
index 917d4d05..c878d64f 100644
--- a/tests/tst-pam_setcred.c
+++ b/tests/tst-pam_setcred.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_start.c b/tests/tst-pam_start.c
index 23af4fe8..728eafe1 100644
--- a/tests/tst-pam_start.c
+++ b/tests/tst-pam_start.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tests/tst-pam_start_confdir.c b/tests/tst-pam_start_confdir.c
index b57ea573..cb2c5704 100644
--- a/tests/tst-pam_start_confdir.c
+++ b/tests/tst-pam_start_confdir.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_access1.c b/xtests/tst-pam_access1.c
index 15711297..271f4868 100644
--- a/xtests/tst-pam_access1.c
+++ b/xtests/tst-pam_access1.c
@@ -40,9 +40,7 @@
   User is member of group tstpamaccess, pam_authenticate should pass.
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_access2.c b/xtests/tst-pam_access2.c
index 293d72ab..7c427f9c 100644
--- a/xtests/tst-pam_access2.c
+++ b/xtests/tst-pam_access2.c
@@ -40,9 +40,7 @@
   User is not member of group tstpamaccess, pam_authenticate should fail.
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_access3.c b/xtests/tst-pam_access3.c
index 817ce930..508f2440 100644
--- a/xtests/tst-pam_access3.c
+++ b/xtests/tst-pam_access3.c
@@ -40,9 +40,7 @@
   pam_authenticate should pass for user tstpamaccess3
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_access4.c b/xtests/tst-pam_access4.c
index 115217f6..73593d50 100644
--- a/xtests/tst-pam_access4.c
+++ b/xtests/tst-pam_access4.c
@@ -42,9 +42,7 @@
   and fail again for localhost
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_authfail.c b/xtests/tst-pam_authfail.c
index 0e7d8087..448b721f 100644
--- a/xtests/tst-pam_authfail.c
+++ b/xtests/tst-pam_authfail.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xtests/tst-pam_authsucceed.c b/xtests/tst-pam_authsucceed.c
index c0ee8023..936d8ec9 100644
--- a/xtests/tst-pam_authsucceed.c
+++ b/xtests/tst-pam_authsucceed.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xtests/tst-pam_dispatch1.c b/xtests/tst-pam_dispatch1.c
index 404c0119..0c082c16 100644
--- a/xtests/tst-pam_dispatch1.c
+++ b/xtests/tst-pam_dispatch1.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xtests/tst-pam_dispatch2.c b/xtests/tst-pam_dispatch2.c
index 5c63f5b3..bf3f634c 100644
--- a/xtests/tst-pam_dispatch2.c
+++ b/xtests/tst-pam_dispatch2.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <strings.h>
diff --git a/xtests/tst-pam_dispatch3.c b/xtests/tst-pam_dispatch3.c
index d44e4880..bbe9ed2e 100644
--- a/xtests/tst-pam_dispatch3.c
+++ b/xtests/tst-pam_dispatch3.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xtests/tst-pam_dispatch4.c b/xtests/tst-pam_dispatch4.c
index a4db8a88..00ee457e 100644
--- a/xtests/tst-pam_dispatch4.c
+++ b/xtests/tst-pam_dispatch4.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xtests/tst-pam_dispatch5.c b/xtests/tst-pam_dispatch5.c
index f1197b38..576dbd46 100644
--- a/xtests/tst-pam_dispatch5.c
+++ b/xtests/tst-pam_dispatch5.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xtests/tst-pam_group1.c b/xtests/tst-pam_group1.c
index e5e5ae1c..30c121d3 100644
--- a/xtests/tst-pam_group1.c
+++ b/xtests/tst-pam_group1.c
@@ -43,9 +43,7 @@
   to tstpamgrp2.
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <grp.h>
 #include <stdio.h>
diff --git a/xtests/tst-pam_limits1.c b/xtests/tst-pam_limits1.c
index d8952400..ed4982de 100644
--- a/xtests/tst-pam_limits1.c
+++ b/xtests/tst-pam_limits1.c
@@ -41,9 +41,7 @@
   getrlimit should return soft=1 and hard=40.
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_motd.c b/xtests/tst-pam_motd.c
index bba2f9d5..2cc006a8 100644
--- a/xtests/tst-pam_motd.c
+++ b/xtests/tst-pam_motd.c
@@ -31,9 +31,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_pwhistory1.c b/xtests/tst-pam_pwhistory1.c
index 1641c298..13adb056 100644
--- a/xtests/tst-pam_pwhistory1.c
+++ b/xtests/tst-pam_pwhistory1.c
@@ -38,9 +38,7 @@
  * Try a new password, should succeed
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_succeed_if1.c b/xtests/tst-pam_succeed_if1.c
index c0187743..78a1c30d 100644
--- a/xtests/tst-pam_succeed_if1.c
+++ b/xtests/tst-pam_succeed_if1.c
@@ -41,9 +41,7 @@
   User is pamtest or tstpamtest, both should succeed.
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_time1.c b/xtests/tst-pam_time1.c
index 18dfeba9..ff773f1a 100644
--- a/xtests/tst-pam_time1.c
+++ b/xtests/tst-pam_time1.c
@@ -41,9 +41,7 @@
   User 'x' should not be able to login.
 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_unix1.c b/xtests/tst-pam_unix1.c
index 5ee24082..665c67d7 100644
--- a/xtests/tst-pam_unix1.c
+++ b/xtests/tst-pam_unix1.c
@@ -35,9 +35,7 @@
  * Test case: '!!' as password should not allow login
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_unix2.c b/xtests/tst-pam_unix2.c
index 65a75f3e..b50fb6bb 100644
--- a/xtests/tst-pam_unix2.c
+++ b/xtests/tst-pam_unix2.c
@@ -37,9 +37,7 @@
  * Second use longer password, 9 characters
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_unix3.c b/xtests/tst-pam_unix3.c
index 50a94587..18ecbebf 100644
--- a/xtests/tst-pam_unix3.c
+++ b/xtests/tst-pam_unix3.c
@@ -38,9 +38,7 @@
  * Third use wrong password, 9 characters
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xtests/tst-pam_unix4.c b/xtests/tst-pam_unix4.c
index 1ba0a40c..b06cec8a 100644
--- a/xtests/tst-pam_unix4.c
+++ b/xtests/tst-pam_unix4.c
@@ -35,9 +35,7 @@
  * Check password change minimum days handling.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>