diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2012-01-11 15:54:07 -0800 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2012-01-11 15:54:07 -0800 |
| commit | 623c9e9605551aa00e843a9ad9bdee23d644fd94 (patch) | |
| tree | 8c8ac44a68493557789a41509f1ea6deaccb35f8 | |
| parent | 37ab4d1f9f40ee331c56983dd530dd9742b74260 (diff) | |
| parent | 9ffe5bac4bb2dbf69f1d5ba7262e8336015c2321 (diff) | |
| download | vyatta-cfg-system-623c9e9605551aa00e843a9ad9bdee23d644fd94.tar.gz vyatta-cfg-system-623c9e9605551aa00e843a9ad9bdee23d644fd94.zip | |
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-cfg-system into oxnard
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | src/local_ip.c | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index bf8522f8..1c457b9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +vyatta-cfg-system (0.19.154) unstable; urgency=low + + [ Jon Andersson ] + * Update to local_ip + + [ Stephen Hemminger ] + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Mon, 09 Jan 2012 14:24:50 -0800 + vyatta-cfg-system (0.19.153) unstable; urgency=low * Bugfix 7689: change vrrp auth_type detection 'simple' to 'plaintext- diff --git a/src/local_ip.c b/src/local_ip.c index 3707559f..f238acfe 100644 --- a/src/local_ip.c +++ b/src/local_ip.c @@ -46,7 +46,9 @@ int main(int argc, char **argv) return -1; } } else { - struct sockaddr_in6 sin6; + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + }; if (inet_pton(af, argv[1], &sin6.sin6_addr) <= 0) { fprintf(stderr, "%s: invalid address\n", argv[1]); |