Changeset 646 in openpam


Ignore:
Timestamp:
Mar 5, 2013, 5:49:06 PM (8 years ago)
Author:
Dag-Erling Smørgrav
Message:

Reorganize:

  • move libpam into lib/libpam
  • move the OATH code into lib/liboath
  • move oath.h into include/security
  • update all pointers
Location:
trunk
Files:
5 added
16 edited
1 copied
87 moved

Legend:

Unmodified
Added
Removed
  • trunk/HISTORY

    r637 r646  
    33 - FEATURE: Add a pam_oath module that implements RFC 4226 (HOTP) and
    44   RFC 6238 (TOTP).
     5
     6 - ENHANCE: Allow openpam_straddch(3) to be called without a character
     7   so it can be used to preallocate a string.
     8
     9 - ENHANCE: Improve portability by adding simple asprintf(3) and
     10   vasprintf(3) implementations for platforms that don't have them.
     11
     12 - ENHANCE: Move the libpam sources into a separate subdirectory.
    513
    614 - BUGFIX: When openpam_readword(3) encountered an opening quote, it
     
    1018   unit tests for quoted strings had any text preceding the opening
    1119   quote.
    12 
    13  - ENHANCE: Allow openpam_straddch(3) to be called without a character
    14    so it can be used to preallocate a string.
    15 
    16  - ENHANCE: Improve portability by adding simple asprintf(3) and
    17    vasprintf(3) implementations for platforms that don't have them.
    1820============================================================================
    1921OpenPAM Micrampelis                                             2012-05-26
  • trunk/autogen.des

    r623 r646  
    1212
    1313./configure \
     14        --with-oath \
    1415        --with-doc \
    1516        --with-pam-unix \
    16         --with-pam-oath \
    1717        --with-pamtest \
    1818        --with-su \
  • trunk/bin/openpam_dump_policy/Makefile.am

    r620 r646  
    11# $Id$
    22
    3 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib
     3AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
    44
    55noinst_PROGRAMS = openpam_dump_policy
    66openpam_dump_policy_SOURCES = openpam_dump_policy.c
    7 openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam.la
     7openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam/libpam.la
  • trunk/bin/pamtest/Makefile.am

    r620 r646  
    55bin_PROGRAMS = pamtest
    66pamtest_SOURCES = pamtest.c
    7 pamtest_LDADD = $(top_builddir)/lib/libpam.la
     7pamtest_LDADD = $(top_builddir)/lib/libpam/libpam.la
    88
    99dist_man1_MANS = pamtest.1
  • trunk/bin/su/Makefile.am

    r620 r646  
    55bin_PROGRAMS = su
    66su_SOURCES = su.c
    7 su_LDADD = $(top_builddir)/lib/libpam.la
     7su_LDADD = $(top_builddir)/lib/libpam/libpam.la
    88
    99dist_man1_MANS = su.1
  • trunk/configure.ac

    r640 r646  
    44AC_REVISION([$Id$])
    55AC_INIT([OpenPAM], [trunk], [des@des.no])
    6 AC_CONFIG_SRCDIR([lib/pam_start.c])
     6AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
    77AC_CONFIG_MACRO_DIR([m4])
    88AM_INIT_AUTOMAKE([foreign])
     
    7070AM_CONDITIONAL([WITH_PAM_UNIX], [test x"$with_pam_unix" = x"yes"])
    7171
    72 AC_ARG_WITH([pam-oath],
    73     AC_HELP_STRING([--with-pam-oath], [compile pam_oath(8) module]),
     72AC_ARG_WITH([oath],
     73    AC_HELP_STRING([--with-oath], [compile OATH library, module and utility]),
    7474    [],
    75     [with_pam_oath=no])
    76 AM_CONDITIONAL([WITH_PAM_OATH], [test x"$with_pam_oath" = x"yes"])
     75    [with_oath=no])
     76AM_CONDITIONAL([WITH_OATH], [test x"$with_oath" = x"yes"])
    7777
    7878AC_ARG_WITH(pamtest,
     
    138138    include/security/Makefile
    139139    lib/Makefile
     140    lib/liboath/Makefile
     141    lib/libpam/Makefile
    140142    modules/Makefile
    141143    modules/pam_deny/Makefile
  • trunk/doc/man/Makefile.am

    r594 r646  
    7474GENDOC = $(top_srcdir)/misc/gendoc.pl
    7575
    76 LIBSRCDIR = $(top_srcdir)/lib
     76LIBSRCDIR = $(top_srcdir)/lib/libpam
    7777
    7878VPATH = $(LIBSRCDIR) $(srcdir)
  • trunk/include/security/Makefile.am

    r405 r646  
    11# $Id$
    22
    3 openpamdir = $(includedir)/security
     3securitydir = $(includedir)/security
    44
    5 openpam_HEADERS = \
     5security_HEADERS = \
    66        openpam.h \
    77        openpam_attr.h \
     
    1111        pam_modules.h \
    1212        pam_types.h
     13
     14if WITH_OATH
     15security_HEADERS += oath.h
     16endif
  • trunk/lib

    • Property svn:ignore
      •  

        old new  
        1 .deps
        2 .libs
        31Makefile
        42Makefile.in
  • trunk/lib/liboath/oath_base32.c

    r645 r646  
    3939#include <stdint.h>
    4040
    41 #include "oath.h"
     41#include <security/oath.h>
    4242
    4343static const char b32[] =
  • trunk/lib/liboath/oath_base64.c

    r645 r646  
    3939#include <stdint.h>
    4040
    41 #include "oath.h"
     41#include <security/oath.h>
    4242
    4343static const char b64[] =
  • trunk/lib/liboath/oath_hotp.c

    r645 r646  
    4040#include <string.h>
    4141
    42 #include "oath.h"
     42#include <security/oath.h>
    4343
    4444#define StToNum(St) (St)
  • trunk/lib/liboath/oath_key.c

    r645 r646  
    5050#include "openpam_strlcmp.h"
    5151
    52 #include "oath.h"
     52#include <security/oath.h>
    5353
    5454/*
  • trunk/lib/liboath/oath_totp.c

    r645 r646  
    3838#include <time.h>
    3939
    40 #include "oath.h"
     40#include <security/oath.h>
    4141
    4242#define TOTP_TIME_STEP 30
  • trunk/modules/Makefile.am

    r642 r646  
    77endif
    88
    9 if WITH_PAM_OATH
     9if WITH_OATH
    1010SUBDIRS += pam_oath
    1111endif
  • trunk/modules/pam_deny/Makefile.am

    r622 r646  
    99pam_deny_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
    1010        -export-symbols-regex '^pam_sm_'
    11 pam_deny_la_LIBADD = $(top_builddir)/lib/libpam.la
     11pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
  • trunk/modules/pam_oath/Makefile.am

    r642 r646  
    22
    33pkglibdir = @OPENPAM_MODULES_DIR@
    4 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib
    5 
    6 noinst_HEADERS = oath.h
     4AM_CPPFLAGS = -I$(top_srcdir)/include
    75
    86pkglib_LTLIBRARIES = pam_oath.la
    9 pam_oath_la_SOURCES = pam_oath.c
    10 pam_oath_la_SOURCES += oath_base32.c oath_base64.c
    11 pam_oath_la_SOURCES += oath_hotp.c oath_totp.c
    12 pam_oath_la_SOURCES += oath_key.c
    137pam_oath_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
    148        -export-symbols-regex '^pam_sm_'
    15 pam_oath_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPTO_LIBS@
     9pam_oath_la_LIBADD = \
     10        $(top_builddir)/lib/libpam/libpam.la \
     11        $(top_builddir)/lib/liboath/liboath.la
  • trunk/modules/pam_oath/pam_oath.c

    r644 r646  
    4646#include <security/pam_modules.h>
    4747#include <security/pam_appl.h>
    48 
    49 #include "oath.h"
     48#include <security/oath.h>
    5049
    5150PAM_EXTERN int
  • trunk/modules/pam_permit/Makefile.am

    r622 r646  
    99pam_permit_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
    1010        -export-symbols-regex '^pam_sm_'
    11 pam_permit_la_LIBADD = $(top_builddir)/lib/libpam.la
     11pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
  • trunk/modules/pam_unix/Makefile.am

    r642 r646  
    99pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
    1010        -export-symbols-regex '^pam_sm_'
    11 pam_unix_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPT_LIBS@
     11pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPT_LIBS@
  • trunk/t/Makefile.am

    r620 r646  
    11# $Id$
    22
    3 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib
     3AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
    44
    55noinst_HEADERS = t.h
     
    1616
    1717# link with libpam and libt
    18 LDADD = libt.a $(top_builddir)/lib/libpam.la
     18LDADD = libt.a $(top_builddir)/lib/libpam/libpam.la
Note: See TracChangeset for help on using the changeset viewer.