Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 123405 | Differences between
and this patch

Collapse All | Expand All

(-)/var/tmp/portage/pam_mysql-0.6.2/work/pam_mysql-0.6.2/acinclude.m4 (-16 / +17 lines)
Lines 22-29 Link Here
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-111 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
  CFLAGS="$ac_save_CFLAGS"
110
  CFLAGS="$ac_save_CFLAGS"
111
])
111
])
Lines 122-133 Link Here
122
        AC_CHECK_HEADERS([pam_appl.h], [
122
        AC_CHECK_HEADERS([pam_appl.h], [
123
          AC_MSG_CHECKING([pam_modules.h usability])
123
          AC_MSG_CHECKING([pam_modules.h usability])
124
          AC_TRY_COMPILE([
124
          AC_TRY_COMPILE([
125
          #include <pam_appl.h>
125
          #include <security/pam_appl.h>
126
          #include <pam_modules.h>
126
          #include <security/pam_modules.h>
127
          ], [], [
127
          ], [], [
128
            AC_MSG_RESULT([yes])
128
            AC_MSG_RESULT([yes])
129
            pam_prefix="$_pfx"
129
            pam_prefix="$_pfx"
130
            pam_include_path="$dir"
130
            pam_include_path="$dir"
131
	    LIBS="$LIBS -lpam"
131
            break
132
            break
132
          ], [
133
          ], [
133
            AC_MSG_RESULT([no])
134
            AC_MSG_RESULT([no])
(-)/var/tmp/portage/pam_mysql-0.6.2/work/pam_mysql-0.6.2/configure.in (-2 / +2 lines)
Lines 116-129 Link Here
116
  PAM_MYSQL_CHECK_PAM(["$withval"])
116
  PAM_MYSQL_CHECK_PAM(["$withval"])
117
], [
117
], [
118
dnl try autodetection...
118
dnl try autodetection...
119
  PAM_MYSQL_CHECK_PAM([/usr /usr/local])
119
  PAM_MYSQL_CHECK_PAM([/usr /usr/include /usr/local])
120
])
120
])
121
121
122
AC_ARG_WITH([pam_mods_dir], [  --with-pam-mods-dir=DIR specify PAM module installation path], [
122
AC_ARG_WITH([pam_mods_dir], [  --with-pam-mods-dir=DIR specify PAM module installation path], [
123
  PAM_MODS_DIR="$withval"
123
  PAM_MODS_DIR="$withval"
124
], [
124
], [
125
  PAM_MODS_DIR=
125
  PAM_MODS_DIR=
126
  for dir in "/lib/security" "/lib/pam" "/usr/lib/security" "/usr/lib/pam" \
126
  for dir in "/lib" "/lib/security" "/usr/lib/security" "/usr/lib/pam" \
127
             "$libdir/pam" "$libdir/security"; do
127
             "$libdir/pam" "$libdir/security"; do
128
    if test -d "$dir"; then
128
    if test -d "$dir"; then
129
      PAM_MODS_DIR="$dir"
129
      PAM_MODS_DIR="$dir"
(-)/var/tmp/portage/pam_mysql-0.6.2/work/pam_mysql-0.6.2/pam_mysql.c (-2 / +2 lines)
Lines 131-138 Link Here
131
#define PAM_SM_SESSION
131
#define PAM_SM_SESSION
132
#define PAM_SM_PASSWORD
132
#define PAM_SM_PASSWORD
133
133
134
#include <pam_appl.h>
134
#include <security/pam_appl.h>
135
#include <pam_modules.h>
135
#include <security/pam_modules.h>
136
136
137
/* }}} */
137
/* }}} */
138
138

Return to bug 123405