[krb5/f13/master] - whitespace fixups for 1.7 to remove fuzz
Nalin Dahyabhai
nalin at fedoraproject.org
Wed Apr 13 18:54:41 UTC 2011
commit ce355606f6d791ab9f4377bd5631eb8aa682edda
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date: Wed Apr 13 14:54:58 2011 -0400
- whitespace fixups for 1.7 to remove fuzz
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;
More information about the scm-commits
mailing list