oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

don't try to load library by default; get library and function name

Browse Source 
from krb5.conf


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6013 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-04-20 10:46:03 +00:00
parent d9cfb0c8cc
commit 285943de7f
1 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
kpasswd/kpasswdd.c
View File

@@ -196,9 +196,9 @@ reply_priv (krb5_auth_context auth_context,
} }
static const char * static const char *
simple_passwd_quality_check (krb5_context context, simple_passwd_quality (krb5_context context,
krb5_principal principal, krb5_principal principal,
krb5_data *pwd) krb5_data *pwd)
{ {
if (pwd->length < 6) if (pwd->length < 6)
return "Password too short"; return "Password too short";
@@ -208,13 +208,16 @@ simple_passwd_quality_check (krb5_context context,
static const char* (*passwd_quality_check)(krb5_context, static const char* (*passwd_quality_check)(krb5_context,
krb5_principal, krb5_principal,
krb5_data*); krb5_data*) = simple_passwd_quality;
extern char *check_library; #ifdef HAVE_DLOPEN
extern char *check_function; extern const char *check_library;
extern const char *check_function;
#define PASSWD_VERSION 0 #define PASSWD_VERSION 0
#endif
static void static void
setup_passwd_quality_check(krb5_context context) setup_passwd_quality_check(krb5_context context)
{ {
@@ -222,24 +225,26 @@ setup_passwd_quality_check(krb5_context context)
void *handle; void *handle;
void *sym; void *sym;
int *version; int *version;
if(check_library == NULL)
return;
handle = dlopen(check_library, RTLD_NOW); handle = dlopen(check_library, RTLD_NOW);
if(handle == NULL) { if(handle == NULL) {
krb5_warnx(context, "failed to open `%s'", check_library); krb5_warnx(context, "failed to open `%s'", check_library);
goto out; return;
} }
version = dlsym(handle, "version"); version = dlsym(handle, "version");
if(version == NULL) { if(version == NULL) {
krb5_warnx(context, krb5_warnx(context,
"didn't find `version' symbol in `%s'", check_library); "didn't find `version' symbol in `%s'", check_library);
dlclose(handle); dlclose(handle);
goto out; return;
} }
if(*version != PASSWD_VERSION) { if(*version != PASSWD_VERSION) {
krb5_warnx(context, krb5_warnx(context,
"version of loaded library is %d (expected %d)", "version of loaded library is %d (expected %d)",
*version, PASSWD_VERSION); *version, PASSWD_VERSION);
dlclose(handle); dlclose(handle);
goto out; return;
} }
sym = dlsym(handle, check_function); sym = dlsym(handle, check_function);
if(sym == NULL) { if(sym == NULL) {
@@ -247,13 +252,11 @@ setup_passwd_quality_check(krb5_context context)
"didn't find `%s' symbol in `%s'", "didn't find `%s' symbol in `%s'",
check_function, check_library); check_function, check_library);
dlclose(handle); dlclose(handle);
goto out; return;
} }
passwd_quality_check = sym; passwd_quality_check = sym;
return; return;
out:
#endif #endif
passwd_quality_check = simple_passwd_quality_check;
} }
static void static void
@@ -592,10 +595,10 @@ sigterm(int sig)
exit_flag = 1; exit_flag = 1;
} }
#define DEFAULT_FUNC_NAME "passwd_quality" #ifdef HAVE_DLOPEN
const char *check_library;
char *check_library = DEFAULT_FUNC_NAME; const char *check_function;
char *check_function = LIBDIR "/" DEFAULT_FUNC_NAME ".so"; #endif
int version_flag; int version_flag;
int help_flag; int help_flag;
@@ -631,6 +634,30 @@ main (int argc, char **argv)
krb5_openlog (context, "kpasswdd", &log_facility); krb5_openlog (context, "kpasswdd", &log_facility);
krb5_set_warn_dest(context, log_facility); krb5_set_warn_dest(context, log_facility);
#ifdef HAVE_DLOPEN
{
const char *tmp;
if(check_library == NULL) {
tmp = krb5_config_get_string(context, NULL,
"password_quality",
"check_library",
NULL);
if(tmp != NULL)
check_library = tmp;
}
if(check_function == NULL) {
tmp = krb5_config_get_string(context, NULL,
"password_quality",
"check_function",
NULL);
if(tmp != NULL)
check_function = tmp;
}
if(check_library != NULL && check_function == NULL)
check_function = "passwd_check";
}
#endif
setup_passwd_quality_check(context); setup_passwd_quality_check(context);
memset (&conf, 0, sizeof(conf)); memset (&conf, 0, sizeof(conf));