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

initialize kadm5 connection for every change (otherwise the modifier

Browse Source 
in the database doesn't get set)


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6483 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-07-22 09:53:26 +00:00
parent e8bb8e29b2
commit e2a3a36c3d
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
kpasswd/kpasswdd.c
View File

@@ -45,7 +45,6 @@ RCSID("$Id$");
#endif #endif
static krb5_context context; static krb5_context context;
static void *kadm5_handle;
static krb5_log_facility *log_facility; static krb5_log_facility *log_facility;
static sig_atomic_t exit_flag = 0; static sig_atomic_t exit_flag = 0;
@@ -281,23 +280,42 @@ change (krb5_auth_context auth_context,
krb5_data *pwd_data) krb5_data *pwd_data)
{ {
krb5_error_code ret; krb5_error_code ret;
char *c; char *client;
kadm5_principal_ent_rec ent; kadm5_principal_ent_rec ent;
krb5_key_data *kd; krb5_key_data *kd;
krb5_salt salt; krb5_salt salt;
krb5_keyblock new_keyblock; krb5_keyblock new_keyblock;
const char *pwd_reason; const char *pwd_reason;
int unchanged; int unchanged;
kadm5_config_params conf;
void *kadm5_handle;
krb5_unparse_name (context, principal, &c); memset (&conf, 0, sizeof(conf));
krb5_unparse_name (context, principal, &client);
krb5_warnx (context, "Changing password for %s", c); ret = kadm5_init_with_password_ctx(context,
free (c); client,
NULL,
KADM5_ADMIN_SERVICE,
&conf, 0, 0,
&kadm5_handle);
if (ret) {
free (client);
krb5_warn (context, ret, "kadm5_init_with_password_ctx");
reply_priv (auth_context, s, sa, sa_size, 2,
"kadm5_init_with_password_ctx failed");
return;
}
krb5_warnx (context, "Changing password for %s", client);
free (client);
pwd_reason = (*passwd_quality_check) (context, principal, pwd_data); pwd_reason = (*passwd_quality_check) (context, principal, pwd_data);
if (pwd_reason != NULL ) { if (pwd_reason != NULL ) {
krb5_warnx (context, "%s", pwd_reason); krb5_warnx (context, "%s", pwd_reason);
reply_priv (auth_context, s, sa, sa_size, 4, pwd_reason); reply_priv (auth_context, s, sa, sa_size, 4, pwd_reason);
kadm5_destroy (kadm5_handle);
return; return;
} }
@@ -309,6 +327,7 @@ change (krb5_auth_context auth_context,
krb5_warn (context, ret, "kadm5_get_principal"); krb5_warn (context, ret, "kadm5_get_principal");
reply_priv (auth_context, s, sa, sa_size, 2, reply_priv (auth_context, s, sa, sa_size, 2,
"kadm5_get_principal failed"); "kadm5_get_principal failed");
kadm5_destroy (kadm5_handle);
return; return;
} }
@@ -369,6 +388,7 @@ change (krb5_auth_context auth_context,
reply_priv (auth_context, s, sa, sa_size, 0, "password changed"); reply_priv (auth_context, s, sa, sa_size, 0, "password changed");
out: out:
kadm5_free_principal_ent (kadm5_handle, &ent); kadm5_free_principal_ent (kadm5_handle, &ent);
kadm5_destroy (kadm5_handle);
} }
static int static int
@@ -630,9 +650,6 @@ int num_args = sizeof(args) / sizeof(args[0]);
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
krb5_error_code ret;
kadm5_config_params conf;
int optind; int optind;
optind = krb5_program_setup(&context, argc, argv, args, num_args, NULL); optind = krb5_program_setup(&context, argc, argv, args, num_args, NULL);
@@ -672,16 +689,6 @@ main (int argc, char **argv)
#endif #endif
setup_passwd_quality_check(context); setup_passwd_quality_check(context);
memset (&conf, 0, sizeof(conf));
ret = kadm5_init_with_password_ctx(context,
KADM5_ADMIN_SERVICE,
NULL,
KADM5_ADMIN_SERVICE,
&conf, 0, 0,
&kadm5_handle);
if (ret)
krb5_err (context, 1, ret, "kadm5_init_with_password_ctx");
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
{ {