Relevant BUGIDs: none

Purpose of commit: cleanup

Commit summary:
---------------

Remove unused files.

4 files changed, 3 insertions, 137 deletions

diff --git a/libpam/Makefile.am b/libpam/Makefile.am
index b7ac5a33..9cf45e82 100644
--- a/libpam/Makefile.am
+++ b/libpam/Makefile.am
@@ -8,13 +8,13 @@ AM_LDFLAGS = $(LIBPRELUDE_LIBS) @LIBDL@
 
 CLEANFILES = *~
 
-EXTRA_DIST = libpam.map pam_map.c
+EXTRA_DIST = libpam.map
 
 include_HEADERS = $(addprefix include/security/, _pam_compat.h _pam_macros.h _pam_types.h pam_appl.h pam_malloc.h pam_modules.h)
 
 noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h
 
-libpam_la_LDFLAGS = -version-info 1:0:0
+libpam_la_LDFLAGS = -no-undefined -version-info 1:0:0
 if HAVE_VERSIONING
   libpam_la_LDFLAGS += -Wl,--version-script=libpam.map
 endif
@@ -24,5 +24,4 @@ lib_LTLIBRARIES = libpam.la
 libpam_la_SOURCES = pam_account.c pam_auth.c pam_data.c pam_delay.c \
 	pam_dispatch.c pam_end.c pam_env.c pam_handlers.c pam_item.c \
 	pam_log.c pam_malloc.c pam_misc.c pam_password.c \
-	pam_prelude.c pam_second.c pam_session.c pam_start.c \
-	pam_static.c pam_strerror.c
+	pam_prelude.c pam_session.c pam_start.c pam_static.c pam_strerror.c
diff --git a/libpam/libpam.map b/libpam/libpam.map
index 66bfed9b..45475bd7 100644
--- a/libpam/libpam.map
+++ b/libpam/libpam.map
@@ -2,7 +2,6 @@ LIBPAM_1.0 {
   global:
     pam_acct_mgmt;
     pam_authenticate;
-    pam_authenticate_secondary;
     pam_chauthtok;
     pam_close_session;
     pam_end;
@@ -19,10 +18,6 @@ LIBPAM_1.0 {
     pam_set_data;
     pam_get_data;
     pam_get_user;
-    pam_get_mapped_authtok;
-    pam_set_mapped_authtok;
-    pam_get_mapped_username;
-    pam_set_mapped_username;
 
   local:
     *;
diff --git a/libpam/pam_map.c b/libpam/pam_map.c
deleted file mode 100644
index b27bb32b..00000000
--- a/libpam/pam_map.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* pam_map.c - PAM mapping interface
- *
- * $Id$
- *
- * This is based on the X/Open XSSO specification of March 1997.
- * It is not implemented as it is going to change... after 1997/9/25.
- *
- */
-
-#include <stdio.h>
-
-#include "pam_private.h"
-
-/* p 54 */
-
-int pam_get_mapped_authtok(pam_handle_t *pamh,
-			   const char *target_module_username,
-			   const char *target_module_type,
-			   const char *target_authn_domain,
-			   size_t *target_authtok_len
-			   unsigned char **target_module_authtok);
-{
-    D(("called"));
-
-    IF_NO_PAMH("pam_get_mapped_authtok",pamh,PAM_SYSTEM_ERR);
-
-    return PAM_SYSTEM_ERROR;
-}
-
-/* p 68 */
-
-int pam_set_mapped_authtok(pam_handle_t *pamh,
-			   char *target_module_username,
-			   size_t *target_authtok_len,
-			   unsigned char *target_module_authtok,
-			   char *target_module_type,
-			   char *target_authn_domain)
-{
-    D(("called"));
-
-    IF_NO_PAMH("pam_set_mapped_authtok",pamh,PAM_SYSTEM_ERR);
-
-    return PAM_SYSTEM_ERROR;
-}
-
-/* p 56 */
-
-int pam_get_mapped_username(pam_handle_t *pamh,
-			    const char *src_username,
-			    const char *src_module_type,
-			    const char *src_authn_domain,
-			    const char *target_module_type,
-			    const char *target_authn_domain,
-			    char **target_module_username)
-{
-    D(("called"));
-
-    IF_NO_PAMH("pam_get_mapped_username",pamh,PAM_SYSTEM_ERR);
-
-    return PAM_SYSTEM_ERROR;
-}
-
-/* p 70 */
-
-int pam_set_mapped_username(pam_handle_t *pamh,
-			    char *src_username,
-			    char *src_module_type,
-			    char *src_authn_domain,
-			    char *target_module_username,
-			    char *target_module_type,
-			    char *target_authn_domain)
-{
-    D(("called"));
-
-    IF_NO_PAMH("pam_set_mapped_username",pamh,PAM_SYSTEM_ERR);
-
-    return PAM_SYSTEM_ERROR;
-}
diff --git a/libpam/pam_second.c b/libpam/pam_second.c
deleted file mode 100644
index 75d86650..00000000
--- a/libpam/pam_second.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * pam_second.c -- PAM secondary authentication
- * (based on XSSO draft spec of March 1997)
- *
- * $Id$
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "pam_private.h"
-
-/* p 42 */
-
-/* XXX - there are actually no plans to support this function. It does
-   not appear to be very well defined */
-
-int pam_authenticate_secondary(pam_handle_t *pamh,
-			       char *target_username,
-			       char *target_module_type,
-			       char *target_authn_domain,
-			       char *target_supp_data,
-			       unsigned char *target_module_authtok,
-			       int flags);
-
-int pam_authenticate_secondary(pam_handle_t *pamh,
-			       char *target_username UNUSED,
-			       char *target_module_type UNUSED,
-			       char *target_authn_domain UNUSED,
-			       char *target_supp_data UNUSED,
-			       unsigned char *target_module_authtok UNUSED,
-			       int flags UNUSED)
-{
-    int retval=PAM_SYSTEM_ERR;
-
-    D(("called"));
-
-    _pam_start_timer(pamh);    /* we try to make the time for a failure
-				  independent of the time it takes to
-				  fail */
-
-    IF_NO_PAMH("pam_authenticate_secondary",pamh,PAM_SYSTEM_ERR);
-
-    _pam_await_timer(pamh, retval);   /* if unsuccessful then wait now */
-
-    D(("pam_authenticate_secondary exit"));
-
-    return retval;
-}