Remove the rest of old, obsolete SCIDI related crap.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1292 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
06d4311e80
commit
d87ec12d0c
|
@ -1141,8 +1141,6 @@ LIBSCLDAP="\${top_builddir}/src/scldap/libscldap.la"
|
|||
AC_SUBST(LIBSCRANDOM)
|
||||
LIBSCRANDOM="\${top_builddir}/src/scrandom/libscrandom.la"
|
||||
|
||||
AM_CONDITIONAL(HAVE_SCIDI, test "foo" = "bar")
|
||||
|
||||
scldap_etc_path=`eval echo ${sysconfdir}` ; scldap_etc_path=`eval echo ${scldap_etc_path}`
|
||||
AC_DEFINE_UNQUOTED(SCLDAP_ETC_PATH, "$scldap_etc_path", [etc path for libscldap])
|
||||
scldap_conf_path=`eval echo ${scldap_etc_path}/scldap.conf`
|
||||
|
|
|
@ -394,13 +394,8 @@ struct scam_framework_ops scam_fw_p15_eid =
|
|||
p15_eid_qualify, /* qualify */
|
||||
p15_eid_auth, /* auth */
|
||||
p15_eid_deinit, /* deinit */
|
||||
#if defined(HAVE_OPENSSL) && defined(HAVE_LDAP) && defined(HAVE_SCIDI)
|
||||
sp_open_session, /* open_session */
|
||||
sp_close_session /* close_session */
|
||||
#else
|
||||
NULL, /* open_session */
|
||||
NULL /* close_session */
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -296,13 +296,8 @@ struct scam_framework_ops scam_fw_p15_ldap =
|
|||
p15_ldap_qualify, /* qualify */
|
||||
p15_ldap_auth, /* auth */
|
||||
p15_ldap_deinit, /* deinit */
|
||||
#if defined(HAVE_OPENSSL) && defined(HAVE_LDAP) && defined(HAVE_SCIDI)
|
||||
sp_open_session, /* open_session */
|
||||
sp_close_session /* close_session */
|
||||
#else
|
||||
NULL, /* open_session */
|
||||
NULL /* close_session */
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -38,9 +38,6 @@ struct scam_framework_ops *scam_frameworks[] =
|
|||
{
|
||||
#ifdef HAVE_OPENSSL
|
||||
#ifdef HAVE_LDAP
|
||||
#ifdef HAVE_SCIDI
|
||||
&scam_fw_sp,
|
||||
#endif
|
||||
#if 0 /* Disabled until it works */
|
||||
&scam_fw_p15_ldap,
|
||||
#endif
|
||||
|
|
|
@ -92,12 +92,6 @@ extern void scam_deinit(scam_context * sctx);
|
|||
extern int scam_open_session(scam_context * sctx, int argc, const char **argv, const char *user);
|
||||
extern int scam_close_session(scam_context * sctx, int argc, const char **argv, const char *user);
|
||||
|
||||
#ifdef HAVE_SCIDI
|
||||
extern struct scam_framework_ops scam_fw_sp;
|
||||
extern int sp_open_session(scam_context * sctx, int argc, const char **argv, const char *user);
|
||||
extern int sp_close_session(scam_context * sctx, int argc, const char **argv, const char *user);
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue