Attachment #84170 for bug #123405




  CFLAGS="$INCLUDES -Werror $CFLAGS"
  AC_MSG_CHECKING([if the second argument of pam_get_user() takes const pointer])
  AC_TRY_COMPILE([
#include <security/pam_appl.h>
#include <security/pam_modules.h>
  ], [
    const char *user;
    pam_get_user((void*)0, &user, (void*)0);


  AC_MSG_CHECKING([if the third argument of pam_get_data() takes const pointer])
  AC_TRY_COMPILE([
#include <security/pam_appl.h>
#include <security/pam_modules.h>
  ], [
    const void *data;
    pam_get_data((void*)0, (void*)0, &data);


  AC_MSG_CHECKING([if the third argument of pam_get_item() takes const pointer])
  AC_TRY_COMPILE([
#include <security/pam_appl.h>
#include <security/pam_modules.h>
  ], [
    const void *item;
    pam_get_item((void*)0, 0, &item);


  AC_MSG_CHECKING([if the second argument of pam_conv.conv() takes const pointer])
  AC_TRY_COMPILE([
#include <security/pam_appl.h>
#include <security/pam_modules.h>
  ], [
    int (*conv)(int num_msg, const struct pam_message **msg,
        struct pam_response **resp, void *appdata_ptr) = NULL;

  PAM_MYSQL_CHECK_CONST([PAM_CONV_AGAIN], [
    AC_DEFINE([HAVE_PAM_CONV_AGAIN], [1], [Define to 1 if PAM defines PAM_CONV_AGAIN constant.])
  ], [], [
#include <security/pam_appl.h>
#include <security/pam_modules.h>
  ])

  PAM_MYSQL_CHECK_CONST([PAM_INCOMPLETE], [
    AC_DEFINE([HAVE_PAM_INCOMPLETE], [1], [Define to 1 if PAM defines PAM_INCOMPLETE constant.])
  ], [], [
#include <security/pam_appl.h>
#include <security/pam_modules.h>
  ])

  PAM_MYSQL_CHECK_CONST([PAM_NEW_AUTHTOK_REQD], [
    AC_DEFINE([HAVE_PAM_NEW_AUTHTOK_REQD], [1], [Define to 1 if PAM defines PAM_NEW_AUTHTOK_REQD constant.])
  ], [], [
#include <security/pam_appl.h>
#include <security/pam_modules.h>
  ])

  PAM_MYSQL_CHECK_CONST([PAM_AUTHTOK_RECOVERY_ERR], [], [
    PAM_MYSQL_CHECK_CONST([PAM_AUTHTOK_RECOVER_ERR], [
      AC_DEFINE([LINUX_PAM_CONST_BUG], [1], [Define to 1 if the implementation does not define PAM_AUTHTOK_RECOVER_ERR])
    ], [], [
#include <security/pam_appl.h>
#include <security/pam_modules.h>
    ])
  ], [
#include <security/pam_appl.h>
#include <security/pam_modules.h>
  ])

  CPPFLAGS="$ac_save_CFLAGS"

        AC_CHECK_HEADERS([pam_appl.h], [
          AC_MSG_CHECKING([pam_modules.h usability])
          AC_TRY_COMPILE([
          #include <security/pam_appl.h>
          #include <security/pam_modules.h>
          ], [], [
            AC_MSG_RESULT([yes])
            pam_prefix="$_pfx"
            pam_include_path="$dir"
            LIBS="$LIBS -lpam"
            break
          ], [
            AC_MSG_RESULT([no])




  PAM_MYSQL_CHECK_PAM(["$withval"])
], [
dnl try autodetection...
  PAM_MYSQL_CHECK_PAM([/usr usr/include /usr/local])
])

AC_ARG_WITH([pam_mods_dir], [  --with-pam-mods-dir=DIR specify PAM module installation path], [
  PAM_MODS_DIR="$withval"
], [
  PAM_MODS_DIR=
  for dir in "/lib /lib/security" "/lib/pam" "/usr/lib/security" "/usr/lib/pam" \
             "$libdir/pam" "$libdir/security"; do
    if test -d "$dir"; then
      PAM_MODS_DIR="$dir"

Lines 152-159 Link Here

(-)./pam_mysql.c (-2 / +2 lines)
152	#define PAM_SM_SESSION	152	#define PAM_SM_SESSION
153	#define PAM_SM_PASSWORD	153	#define PAM_SM_PASSWORD
154		154
155	#include <pam_appl.h>	155	#include <security/pam_appl.h>
156	#include <pam_modules.h>	156	#include <security/pam_modules.h>
157		157
158	/* }}} */	158	/* }}} */
159		159

Return to bug 123405

Lines 122-135 Link Here

(-)./configure.in (-2 / +2 lines)
122	PAM_MYSQL_CHECK_PAM(["$withval"])	122	PAM_MYSQL_CHECK_PAM(["$withval"])
123	], [	123	], [
124	dnl try autodetection...	124	dnl try autodetection...
125	PAM_MYSQL_CHECK_PAM([/usr /usr/local])	125	PAM_MYSQL_CHECK_PAM([/usr usr/include /usr/local])
126	])	126	])
127		127
128	AC_ARG_WITH([pam_mods_dir], [ --with-pam-mods-dir=DIR specify PAM module installation path], [	128	AC_ARG_WITH([pam_mods_dir], [ --with-pam-mods-dir=DIR specify PAM module installation path], [
129	PAM_MODS_DIR="$withval"	129	PAM_MODS_DIR="$withval"
130	], [	130	], [
131	PAM_MODS_DIR=	131	PAM_MODS_DIR=
132	for dir in "/lib/security" "/lib/pam" "/usr/lib/security" "/usr/lib/pam" \	132	for dir in "/lib /lib/security" "/lib/pam" "/usr/lib/security" "/usr/lib/pam" \
133	"$libdir/pam" "$libdir/security"; do	133	"$libdir/pam" "$libdir/security"; do
134	if test -d "$dir"; then	134	if test -d "$dir"; then
135	PAM_MODS_DIR="$dir"	135	PAM_MODS_DIR="$dir"

Lines 22-29 Link Here

(-)./acinclude.m4 (-20 / +21 lines)
22	CFLAGS="$INCLUDES -Werror $CFLAGS"	22	CFLAGS="$INCLUDES -Werror $CFLAGS"
23	AC_MSG_CHECKING([if the second argument of pam_get_user() takes const pointer])	23	AC_MSG_CHECKING([if the second argument of pam_get_user() takes const pointer])
24	AC_TRY_COMPILE([	24	AC_TRY_COMPILE([
25	#include <pam_appl.h>	25	#include <security/pam_appl.h>
26	#include <pam_modules.h>	26	#include <security/pam_modules.h>
27	], [	27	], [
28	const char *user;	28	const char *user;
29	pam_get_user((void)0, &user, (void)0);	29	pam_get_user((void)0, &user, (void)0);
Lines 37-44 Link Here
37		37
38	AC_MSG_CHECKING([if the third argument of pam_get_data() takes const pointer])	38	AC_MSG_CHECKING([if the third argument of pam_get_data() takes const pointer])
39	AC_TRY_COMPILE([	39	AC_TRY_COMPILE([
40	#include <pam_appl.h>	40	#include <security/pam_appl.h>
41	#include <pam_modules.h>	41	#include <security/pam_modules.h>
42	], [	42	], [
43	const void *data;	43	const void *data;
44	pam_get_data((void)0, (void)0, &data);	44	pam_get_data((void)0, (void)0, &data);
Lines 52-59 Link Here
52		52
53	AC_MSG_CHECKING([if the third argument of pam_get_item() takes const pointer])	53	AC_MSG_CHECKING([if the third argument of pam_get_item() takes const pointer])
54	AC_TRY_COMPILE([	54	AC_TRY_COMPILE([
55	#include <pam_appl.h>	55	#include <security/pam_appl.h>
56	#include <pam_modules.h>	56	#include <security/pam_modules.h>
57	], [	57	], [
58	const void *item;	58	const void *item;
59	pam_get_item((void*)0, 0, &item);	59	pam_get_item((void*)0, 0, &item);
Lines 67-74 Link Here
67		67
68	AC_MSG_CHECKING([if the second argument of pam_conv.conv() takes const pointer])	68	AC_MSG_CHECKING([if the second argument of pam_conv.conv() takes const pointer])
69	AC_TRY_COMPILE([	69	AC_TRY_COMPILE([
70	#include <pam_appl.h>	70	#include <security/pam_appl.h>
71	#include <pam_modules.h>	71	#include <security/pam_modules.h>
72	], [	72	], [
73	int (conv)(int num_msg, const struct pam_message *msg,	73	int (conv)(int num_msg, const struct pam_message *msg,
74	struct pam_response *resp, void appdata_ptr) = NULL;	74	struct pam_response *resp, void appdata_ptr) = NULL;
Lines 90-123 Link Here
90	PAM_MYSQL_CHECK_CONST([PAM_CONV_AGAIN], [	90	PAM_MYSQL_CHECK_CONST([PAM_CONV_AGAIN], [
91	AC_DEFINE([HAVE_PAM_CONV_AGAIN], [1], [Define to 1 if PAM defines PAM_CONV_AGAIN constant.])	91	AC_DEFINE([HAVE_PAM_CONV_AGAIN], [1], [Define to 1 if PAM defines PAM_CONV_AGAIN constant.])
92	], [], [	92	], [], [
93	#include <pam_appl.h>	93	#include <security/pam_appl.h>
94	#include <pam_modules.h>	94	#include <security/pam_modules.h>
95	])	95	])
96		96
97	PAM_MYSQL_CHECK_CONST([PAM_INCOMPLETE], [	97	PAM_MYSQL_CHECK_CONST([PAM_INCOMPLETE], [
98	AC_DEFINE([HAVE_PAM_INCOMPLETE], [1], [Define to 1 if PAM defines PAM_INCOMPLETE constant.])	98	AC_DEFINE([HAVE_PAM_INCOMPLETE], [1], [Define to 1 if PAM defines PAM_INCOMPLETE constant.])
99	], [], [	99	], [], [
100	#include <pam_appl.h>	100	#include <security/pam_appl.h>
101	#include <pam_modules.h>	101	#include <security/pam_modules.h>
102	])	102	])
103		103
104	PAM_MYSQL_CHECK_CONST([PAM_NEW_AUTHTOK_REQD], [	104	PAM_MYSQL_CHECK_CONST([PAM_NEW_AUTHTOK_REQD], [
105	AC_DEFINE([HAVE_PAM_NEW_AUTHTOK_REQD], [1], [Define to 1 if PAM defines PAM_NEW_AUTHTOK_REQD constant.])	105	AC_DEFINE([HAVE_PAM_NEW_AUTHTOK_REQD], [1], [Define to 1 if PAM defines PAM_NEW_AUTHTOK_REQD constant.])
106	], [], [	106	], [], [
107	#include <pam_appl.h>	107	#include <security/pam_appl.h>
108	#include <pam_modules.h>	108	#include <security/pam_modules.h>
109	])	109	])
110		110
111	PAM_MYSQL_CHECK_CONST([PAM_AUTHTOK_RECOVERY_ERR], [], [	111	PAM_MYSQL_CHECK_CONST([PAM_AUTHTOK_RECOVERY_ERR], [], [
112	PAM_MYSQL_CHECK_CONST([PAM_AUTHTOK_RECOVER_ERR], [	112	PAM_MYSQL_CHECK_CONST([PAM_AUTHTOK_RECOVER_ERR], [
113	AC_DEFINE([LINUX_PAM_CONST_BUG], [1], [Define to 1 if the implementation does not define PAM_AUTHTOK_RECOVER_ERR])	113	AC_DEFINE([LINUX_PAM_CONST_BUG], [1], [Define to 1 if the implementation does not define PAM_AUTHTOK_RECOVER_ERR])
114	], [], [	114	], [], [
115	#include <pam_appl.h>	115	#include <security/pam_appl.h>
116	#include <pam_modules.h>	116	#include <security/pam_modules.h>
117	])	117	])
118	], [	118	], [
119	#include <pam_appl.h>	119	#include <security/pam_appl.h>
120	#include <pam_modules.h>	120	#include <security/pam_modules.h>
121	])	121	])
122		122
123	CPPFLAGS="$ac_save_CFLAGS"	123	CPPFLAGS="$ac_save_CFLAGS"
Lines 135-146 Link Here
135	AC_CHECK_HEADERS([pam_appl.h], [	135	AC_CHECK_HEADERS([pam_appl.h], [
136	AC_MSG_CHECKING([pam_modules.h usability])	136	AC_MSG_CHECKING([pam_modules.h usability])
137	AC_TRY_COMPILE([	137	AC_TRY_COMPILE([
138	#include <pam_appl.h>	138	#include <security/pam_appl.h>
139	#include <pam_modules.h>	139	#include <security/pam_modules.h>
140	], [], [	140	], [], [
141	AC_MSG_RESULT([yes])	141	AC_MSG_RESULT([yes])
142	pam_prefix="$_pfx"	142	pam_prefix="$_pfx"
143	pam_include_path="$dir"	143	pam_include_path="$dir"
		144	LIBS="$LIBS -lpam"
144	break	145	break
145	], [	146	], [
146	AC_MSG_RESULT([no])	147	AC_MSG_RESULT([no])