Commit f84a2c69 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5535

parent 20f44fed
...@@ -47,6 +47,7 @@ OpenLDAP 2.4.17 Engineering ...@@ -47,6 +47,7 @@ OpenLDAP 2.4.17 Engineering
Fixed slapo-rwm entry free (ITS#6058) Fixed slapo-rwm entry free (ITS#6058)
Fixed slapo-rwm entry release (ITS#6081) Fixed slapo-rwm entry release (ITS#6081)
Fixed slapo-translucent entry gathering (ITS#6156) Fixed slapo-translucent entry gathering (ITS#6156)
Fixed contrib/smbk5pwd use of private functions (ITS#5535)
Build Environment Build Environment
Added test056-monitor (ITS#5540) Added test056-monitor (ITS#5540)
Added test057-memberof-refint (ITS#5395) Added test057-memberof-refint (ITS#5395)
......
...@@ -421,6 +421,7 @@ static int smbk5pwd_exop_passwd( ...@@ -421,6 +421,7 @@ static int smbk5pwd_exop_passwd(
krb5_error_code ret; krb5_error_code ret;
hdb_entry ent; hdb_entry ent;
struct berval *keys; struct berval *keys;
size_t nkeys;
int kvno, i; int kvno, i;
Attribute *a; Attribute *a;
...@@ -451,7 +452,9 @@ static int smbk5pwd_exop_passwd( ...@@ -451,7 +452,9 @@ static int smbk5pwd_exop_passwd(
op->o_log_prefix, e->e_name.bv_val, 0 ); op->o_log_prefix, e->e_name.bv_val, 0 );
} }
ret = _kadm5_set_keys(kadm_context, &ent, qpw->rs_new.bv_val); ret = hdb_generate_key_set_password(context, ent.principal,
qpw->rs_new.bv_val, &ent.keys.val, &nkeys);
ent.keys.len = nkeys;
hdb_seal_keys(context, db, &ent); hdb_seal_keys(context, db, &ent);
krb5_free_principal( context, ent.principal ); krb5_free_principal( context, ent.principal );
...@@ -470,7 +473,7 @@ static int smbk5pwd_exop_passwd( ...@@ -470,7 +473,7 @@ static int smbk5pwd_exop_passwd(
} }
BER_BVZERO( &keys[i] ); BER_BVZERO( &keys[i] );
_kadm5_free_keys(kadm_context, ent.keys.len, ent.keys.val); hdb_free_keys(context, ent.keys.len, ent.keys.val);
if ( i != ent.keys.len ) { if ( i != ent.keys.len ) {
ber_bvarray_free( keys ); ber_bvarray_free( keys );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment