From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 24 Aug 2002 00:01:01 +0000 (+0000)
Subject: * sendto_kdc.c (merge_addrlists): Truncate source address list after copying
X-Git-Tag: krb5-1.3-alpha1~476
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a5da4e5b1e219f9a0346cf0bbeec08dba57431b4;p=krb5.git

* sendto_kdc.c (merge_addrlists): Truncate source address list after copying
its data into the destination list.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14762 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index b5bdd71ae..fbb08f6e0 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
+	* sendto_kdc.c (merge_addrlists): Truncate source address list
+	after copying its data into the destination list.
+
 	* Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
 
 2002-08-22  Ken Raeburn  <raeburn@mit.edu>
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 2bebcb8b5..fff77c1df 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -205,6 +205,7 @@ merge_addrlists (struct addrlist *dest, struct addrlist *src)
 	src->addrs[i] = 0;
     }
     dest->naddrs += i;
+    src->naddrs = 0;
 
     dprint("\tout:   ");
     for (i = 0; i < dest->naddrs; i++)