From: Tom Gundersen <teg@jklm.no>
Date: Tue, 29 Apr 2014 10:46:06 +0000 (+0200)
Subject: sd-dhcp-leaes: use newdup()
X-Git-Tag: v213~286
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=0b21bde96d6d33313bac42ae1d5802a83a4e7b2f;p=elogind.git

sd-dhcp-leaes: use newdup()
---

diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index 69418d98e..61822abd2 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -211,36 +211,24 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option,
 
         case DHCP_OPTION_DOMAIN_NAME_SERVER:
                 if (len && !(len % 4)) {
-                        unsigned i;
-
                         lease->dns_size = len / 4;
 
                         free(lease->dns);
-                        lease->dns = new0(struct in_addr, lease->dns_size);
+                        lease->dns = newdup(struct in_addr, option, lease->dns_size);
                         if (!lease->dns)
                                 return -ENOMEM;
-
-                        for (i = 0; i < lease->dns_size; i++) {
-                                memcpy(&lease->dns[i].s_addr, option + 4 * i, 4);
-                        }
                 }
 
                 break;
 
         case DHCP_OPTION_NTP_SERVER:
                 if (len && !(len % 4)) {
-                        unsigned i;
-
                         lease->ntp_size = len / 4;
 
                         free(lease->ntp);
-                        lease->ntp = new0(struct in_addr, lease->ntp_size);
+                        lease->ntp = newdup(struct in_addr, option, lease->ntp_size);
                         if (!lease->ntp)
                                 return -ENOMEM;
-
-                        for (i = 0; i < lease->ntp_size; i++) {
-                                memcpy(&lease->ntp[i].s_addr, option + 4 * i, 4);
-                        }
                 }
 
                 break;