Merge "Fix a gethnamaddr.c warning that's already fixed upstream."