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/slave | |
| 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/slave')
| -rw-r--r-- | src/slave/kprop.c | 10 | ||||
| -rw-r--r-- | src/slave/kpropd.c | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/slave/kprop.c b/src/slave/kprop.c index c53f9deab..91a7b65aa 100644 --- a/src/slave/kprop.c +++ b/src/slave/kprop.c @@ -511,11 +511,11 @@ xmit_database(fd, database_fd, database_size) exit(1); } if (retval = krb5_write_message((void *) &fd, &outbuf)) { - xfree(outbuf.data); + krb5_xfree(outbuf.data); com_err(progname, retval, "while sending database size"); exit(1); } - xfree(outbuf.data); + krb5_xfree(outbuf.data); /* * Initialize the initial vector. */ @@ -552,13 +552,13 @@ xmit_database(fd, database_fd, database_size) exit(1); } if (retval = krb5_write_message((void *) &fd, &outbuf)) { - xfree(outbuf.data); + krb5_xfree(outbuf.data); com_err(progname, retval, "while sending database block starting at %d", sent_size); exit(1); } - xfree(outbuf.data); + krb5_xfree(outbuf.data); sent_size += n; if (debug) printf("%d bytes sent.\n", sent_size); @@ -650,7 +650,7 @@ send_error(fd, err_text, err_code) strcpy(error.text.data, text); if (!krb5_mk_error(&error, &outbuf)) { (void) krb5_write_message((void *) &fd, &outbuf); - xfree(outbuf.data); + krb5_xfree(outbuf.data); } free(error.text.data); } diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c index 0077aa54f..2903290a2 100644 --- a/src/slave/kpropd.c +++ b/src/slave/kpropd.c @@ -616,14 +616,14 @@ recv_database(fd, database_fd) KRB5_SAFE_DOSEQUENCE|KRB5_SAFE_NOTIME, 0, &outbuf)) { send_error(fd, retval, "while decoding database size"); - xfree(inbuf.data); + krb5_xfree(inbuf.data); com_err(progname, retval, "while decoding database size from client"); exit(1); } memcpy((char *) &database_size, outbuf.data, sizeof(database_size)); - xfree(inbuf.data); - xfree(outbuf.data); + krb5_xfree(inbuf.data); + krb5_xfree(outbuf.data); database_size = ntohl(database_size); /* * Initialize the initial vector. @@ -662,12 +662,12 @@ recv_database(fd, database_fd) received_size); com_err(progname, retval, buf); send_error(fd, retval, buf); - xfree(inbuf.data); + krb5_xfree(inbuf.data); exit(1); } n = write(database_fd, outbuf.data, outbuf.length); - xfree(inbuf.data); - xfree(outbuf.data); + krb5_xfree(inbuf.data); + krb5_xfree(outbuf.data); if (n < 0) { sprintf(buf, "while writing database block starting at offset %d", @@ -712,12 +712,12 @@ recv_database(fd, database_fd) exit(1); } if (retval = krb5_write_message((void *) &fd, &outbuf)) { - xfree(outbuf.data); + krb5_xfree(outbuf.data); com_err(progname, retval, "while sending # of receeived bytes"); exit(1); } - xfree(outbuf.data); + krb5_xfree(outbuf.data); } @@ -756,7 +756,7 @@ send_error(fd, err_code, err_text) strcpy(error.text.data, text); if (!krb5_mk_error(&error, &outbuf)) { (void) krb5_write_message((void *) &fd, &outbuf); - xfree(outbuf.data); + krb5_xfree(outbuf.data); } free(error.text.data); } |
