diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2011-04-13 14:54:58 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2011-04-13 14:54:58 -0400 |
| commit | ce355606f6d791ab9f4377bd5631eb8aa682edda (patch) | |
| tree | e274641440b18930525fb9b11294ad4c96452de6 | |
| parent | d75debd9ecfbbfea388a00e88d64f4b802377e26 (diff) | |
| download | krb5-ce355606f6d791ab9f4377bd5631eb8aa682edda.tar.gz krb5-ce355606f6d791ab9f4377bd5631eb8aa682edda.tar.xz krb5-ce355606f6d791ab9f4377bd5631eb8aa682edda.zip | |
- whitespace fixups for 1.7 to remove fuzz
| -rw-r--r-- | 2011-004-patch-r18.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/2011-004-patch-r18.txt b/2011-004-patch-r18.txt index 43daa9b..cdccf68 100644 --- a/2011-004-patch-r18.txt +++ b/2011-004-patch-r18.txt @@ -1,10 +1,13 @@ +http://web.mit.edu/kerberos/advisories/2011-004-patch-r18.txt, with +whitespace changes made to allow it to apply without fuzz. + diff --git a/src/kadmin/server/network.c b/src/kadmin/server/network.c index c8ce4f1..bb911ff 100644 --- a/src/kadmin/server/network.c +++ b/src/kadmin/server/network.c @@ -1384,6 +1384,10 @@ cleanup: if (local_kaddrs != NULL) - krb5_free_addresses(server_handle->context, local_kaddrs); + krb5_free_addresses(server_handle->context, local_kaddrs); + if ((*response)->data == NULL) { + free(*response); @@ -22,7 +25,7 @@ index c1b2217..992b55f 100644 plen = (plen<<8) | (*ptr++ & 0xff); - if (plen != req->length) -- return(KRB5KRB_AP_ERR_MODIFIED); +- return(KRB5KRB_AP_ERR_MODIFIED); + if (plen != req->length) { + ret = KRB5KRB_AP_ERR_MODIFIED; + numresult = KRB5_KPASSWD_MALFORMED; |