Changeset 690 in openpam


Ignore:
Timestamp:
Aug 15, 2013, 1:22:51 PM (7 years ago)
Author:
Dag-Erling Smørgrav
Message:

The --with-modules-dir configure option never quite worked, and became
even more badly broken when the dynamic loader was rewritten in March.
Reimplement it the way it was always meant to work (but never did):

If --with-modules-dir was specified, modules will be installed in that
directory and the dynamic loader will look for them there. If it was
not specified, modules will be installed in libdir and the dynamic
loader will use the standard search path (/usr/lib:/usr/local/lib). In
both cases, a policy file can still name a module by its full path.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/HISTORY

    r675 r690  
    2525   unit tests for quoted strings had any text preceding the opening
    2626   quote.
     27
     28 - BUGFIX: make --with-modules-dir work the way it was meant to work
     29   (but never did).
    2730============================================================================
    2831OpenPAM Micrampelis                                             2012-05-26
  • trunk/configure.ac

    r684 r690  
    4949    [AS_IF([test x"$withval" != x"no"], [
    5050        OPENPAM_MODULES_DIR="$withval"
    51     ], [
    52         OPENPAM_MODULES_DIR="$libdir"
    53     ])],
    54     [OPENPAM_MODULES_DIR="$libdir"])
    55 AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR,
    56     "${OPENPAM_MODULES_DIR%/}/",
    57     [OpenPAM modules directory])
     51        AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR,
     52            "${OPENPAM_MODULES_DIR%/}",
     53            [OpenPAM modules directory])
     54    ])])
    5855AC_SUBST(OPENPAM_MODULES_DIR)
     56AM_CONDITIONAL([CUSTOM_MODULES_DIR], [test x"$OPENPAM_MODULES_DIR" != x""])
    5957
    6058AC_ARG_WITH([doc],
  • trunk/lib/libpam/openpam_constants.c

    r659 r690  
    136136
    137137const char *openpam_module_path[] = {
     138#ifdef OPENPAM_MODULES_DIRECTORY
     139        OPENPAM_MODULES_DIRECTORY,
     140#else
    138141        "/usr/lib",
    139142        "/usr/local/lib",
     143#endif
    140144        NULL
    141145};
  • trunk/modules/pam_deny/Makefile.am

    r648 r690  
    11# $Id$
    22
    3 pkglibdir = @OPENPAM_MODULES_DIR@
     3if CUSTOM_MODULES_DIR
     4moduledir = @OPENPAM_MODULES_DIR@
     5else
     6moduledir = $(libdir)
     7endif
    48AM_CPPFLAGS = -I$(top_srcdir)/include
    59
    6 pkglib_LTLIBRARIES = pam_deny.la
     10module_LTLIBRARIES = pam_deny.la
    711
    812pam_deny_la_SOURCES = pam_deny.c
  • trunk/modules/pam_oath/Makefile.am

    r648 r690  
    11# $Id$
    22
    3 pkglibdir = @OPENPAM_MODULES_DIR@
     3if CUSTOM_MODULES_DIR
     4moduledir = @OPENPAM_MODULES_DIR@
     5else
     6moduledir = $(libdir)
     7endif
    48AM_CPPFLAGS = -I$(top_srcdir)/include
    59
    6 pkglib_LTLIBRARIES = pam_oath.la
     10module_LTLIBRARIES = pam_oath.la
     11
     12pam_oath_la_SOURCES = pam_oath.c
    713pam_oath_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
    814        -export-symbols-regex '^pam_sm_'
  • trunk/modules/pam_permit/Makefile.am

    r648 r690  
    11# $Id$
    22
    3 pkglibdir = @OPENPAM_MODULES_DIR@
     3if CUSTOM_MODULES_DIR
     4moduledir = @OPENPAM_MODULES_DIR@
     5else
     6moduledir = $(libdir)
     7endif
    48AM_CPPFLAGS = -I$(top_srcdir)/include
    59
    6 pkglib_LTLIBRARIES = pam_permit.la
     10module_LTLIBRARIES = pam_permit.la
    711
    812pam_permit_la_SOURCES = pam_permit.c
  • trunk/modules/pam_unix/Makefile.am

    r648 r690  
    11# $Id$
    22
    3 pkglibdir = @OPENPAM_MODULES_DIR@
     3if CUSTOM_MODULES_DIR
     4moduledir = @OPENPAM_MODULES_DIR@
     5else
     6moduledir = $(libdir)
     7endif
    48AM_CPPFLAGS = -I$(top_srcdir)/include
    59
    6 pkglib_LTLIBRARIES = pam_unix.la
     10module_LTLIBRARIES = pam_unix.la
    711
    812pam_unix_la_SOURCES = pam_unix.c
Note: See TracChangeset for help on using the changeset viewer.