diff options
| author | Will Fiveash <will.fiveash@oracle.com> | 2009-01-28 21:15:46 +0000 |
|---|---|---|
| committer | Will Fiveash <will.fiveash@oracle.com> | 2009-01-28 21:15:46 +0000 |
| commit | d91a7ff0542f620a296e5718c1c5d33240efa67a (patch) | |
| tree | a7c1efa10a6a7f928c47d274307d5eaceffec107 /src/kadmin/dbutil | |
| parent | 51049b194ad6d4c6ef088d9c277b59129888c1a9 (diff) | |
| download | krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.zip krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.tar.gz krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.tar.bz2 | |
svn merge -r21791:21820 svn+ssh://wfiveash@svn.mit.edu/krb5/trunk
All conflicts resolved, everything builds. Did a quick test, seems to
work ok.
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21822 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/dbutil')
| -rw-r--r-- | src/kadmin/dbutil/dump.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index ab42e9a..69ebec4 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -589,8 +589,8 @@ dump_k5beta_iterator(ptr, entry) krb5_dbe_lookup_last_pwd_change(arg->kcontext, entry, &last_pwd_change))) { fprintf(stderr, nokeys_err, arg->programname, name); - krb5_xfree(mod_name); - krb5_xfree(name); + free(mod_name); + free(name); return(retval); } @@ -606,8 +606,8 @@ dump_k5beta_iterator(ptr, entry) KRB5_KDB_SALTTYPE_V4, &akey))) { fprintf(stderr, nokeys_err, arg->programname, name); - krb5_xfree(mod_name); - krb5_xfree(name); + free(mod_name); + free(name); return(retval); } @@ -672,9 +672,9 @@ dump_k5beta_iterator(ptr, entry) /* If we're blabbing, do it */ if (arg->verbose) fprintf(stderr, "%s\n", name); - krb5_xfree(mod_name); + free(mod_name); } - krb5_xfree(name); + free(name); return(0); } @@ -849,7 +849,7 @@ dump_k5beta6_iterator_ext(ptr, entry, kadm) retval = EINVAL; } } - krb5_xfree(name); + free(name); return(retval); } |