From 2b41afbb3f35dabdd516649b5debf9d92e9c747b Mon Sep 17 00:00:00 2001 From: alonbl Date: Fri, 16 Jan 2009 21:27:46 +0000 Subject: [PATCH] Set hardcoded default for profile_dir git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3624 c6295689-39f2-0310-b995-f0e70906c6a9 --- etc/opensc.conf.in | 5 +++-- src/pkcs15init/profile.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/etc/opensc.conf.in b/etc/opensc.conf.in index 78b8c5b2..e84f8f0f 100644 --- a/etc/opensc.conf.in +++ b/etc/opensc.conf.in @@ -32,8 +32,9 @@ app default { # PKCS#15 initialization / personalization # profiles directory for pkcs15-init. - - profile_dir = @pkgdatadir@; + # Default: @pkgdatadir@ + # + # profile_dir = @pkgdatadir@; # What reader drivers to load at start-up # diff --git a/src/pkcs15init/profile.c b/src/pkcs15init/profile.c index 944c4b4e..0a3c2f05 100644 --- a/src/pkcs15init/profile.c +++ b/src/pkcs15init/profile.c @@ -300,9 +300,10 @@ sc_profile_load(struct sc_profile *profile, const char *filename) } if (!profile_dir) { - sc_error(ctx, "you need to set profile_dir in your config file."); - return SC_ERROR_FILE_NOT_FOUND; - } + profile_dir = SC_PKCS15_PROFILE_DIRECTORY; + } + + sc_debug(ctx, "Using profile directory '%s'.", profile_dir); #ifdef _WIN32 snprintf(path, sizeof(path), "%s\\%s.%s",