diff options
| author | Theodore Tso <tytso@mit.edu> | 1993-10-15 16:52:33 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1993-10-15 16:52:33 +0000 |
| commit | 5bb27f267ab3039b23452595cf345eecd81acf4d (patch) | |
| tree | d2d3a8455fc8c53540fa8fc8ebad73cf42ff86a3 /src/kadmin/server | |
| parent | 3909e34b87a1a783d63e276568f2549cdc2d2795 (diff) | |
| download | krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.tar.gz krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.tar.xz krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.zip | |
Change use of xfree to krb5_xfree to prevent namespace pollution
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2670 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/server')
| -rw-r--r-- | src/kadmin/server/adm_funcs.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/kadmin/server/adm_funcs.c b/src/kadmin/server/adm_funcs.c index 3a5817dca..f36233825 100644 --- a/src/kadmin/server/adm_funcs.c +++ b/src/kadmin/server/adm_funcs.c @@ -214,9 +214,9 @@ OLDDECLARG(krb5_db_entry *, entry) memset((char *) entry->key.contents, 0, entry->key.length); memset((char *) entry->alt_key.contents, 0, entry->alt_key.length); if (entry->key.contents) - xfree(entry->key.contents); + krb5_xfree(entry->key.contents); if (entry->alt_key.contents) - xfree(entry->alt_key.contents); + krb5_xfree(entry->alt_key.contents); return(KRB_ERR_GENERIC); } @@ -263,9 +263,9 @@ OLDDECLARG(krb5_db_entry *, entry) memset((char *) entry->key.contents, 0, entry->key.length); memset((char *) entry->alt_key.contents, 0, entry->alt_key.length); if (entry->key.contents) - xfree(entry->key.contents); + krb5_xfree(entry->key.contents); if (entry->alt_key.contents) - xfree(entry->alt_key.contents); + krb5_xfree(entry->alt_key.contents); return(5); } } @@ -274,11 +274,11 @@ OLDDECLARG(krb5_db_entry *, entry) memset((char *) entry->key.contents, 0, entry->key.length); if (entry->key.contents) - xfree(entry->key.contents); + krb5_xfree(entry->key.contents); memset((char *) entry->alt_key.contents, 0, entry->alt_key.length); if (entry->alt_key.contents) - xfree(entry->alt_key.contents); + krb5_xfree(entry->alt_key.contents); if (retval) { com_err("adm_modify_kdb", retval, @@ -370,7 +370,7 @@ OLDDECLARG(krb5_db_entry *, entry) } salt.saltdata = *foo; - xfree(foo); + krb5_xfree(foo); altsalt.salttype = KRB5_KDB_SALTTYPE_V4; altsalt.saltdata.data = 0; altsalt.saltdata.length = 0; @@ -391,7 +391,7 @@ OLDDECLARG(krb5_db_entry *, entry) com_err("adm_enter_pwd_key", retval, "while converting password to alt_key for '%s'", newprinc); memset((char *) new_password, 0, sizeof(new_password)); /* erase it */ - xfree(salt.saltdata.data); + krb5_xfree(salt.saltdata.data); return(retval); } @@ -402,7 +402,7 @@ OLDDECLARG(krb5_db_entry *, entry) &altsalt.saltdata)) { com_err("adm_enter_pwd_key", retval, "while converting password to alt_key for '%s'", newprinc); - xfree(salt.saltdata.data); + krb5_xfree(salt.saltdata.data); free(entry->alt_key.contents); memset((char *) new_password, 0, sizeof(new_password)); /* erase it */ return(retval); @@ -546,7 +546,7 @@ OLDDECLARG(krb5_db_entry *, entry) com_err("adm_enter_rnd_pwd_key", 0, "Unable to Initialize Random Key"); (void) krb5_finish_key(&master_encblock); memset((char *)master_keyblock.contents, 0, master_keyblock.length); - xfree(master_keyblock.contents); + krb5_xfree(master_keyblock.contents); goto finish; } |