Annotation of /trunk/networkmanager/patches/networkmanager-0.8.9997-hostname.patch
Parent Directory | Revision Log
Revision 1486 -
(hide annotations)
(download)
Thu Aug 4 22:43:25 2011 UTC (13 years, 1 month ago) by niro
File size: 906 byte(s)
Thu Aug 4 22:43:25 2011 UTC (13 years, 1 month ago) by niro
File size: 906 byte(s)
-fixed patch, do not initialize unused vars too
1 | niro | 1486 | diff -Naur NetworkManager-0.8.9997/src/nm-policy.c NetworkManager-0.8.9997-magellan/src/nm-policy.c |
2 | --- NetworkManager-0.8.9997/src/nm-policy.c 2011-05-27 16:28:36.000000000 +0200 | ||
3 | +++ NetworkManager-0.8.9997-magellan/src/nm-policy.c 2011-08-05 02:16:33.000000000 +0200 | ||
4 | @@ -268,9 +268,11 @@ | ||
5 | update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) | ||
6 | { | ||
7 | char *configured_hostname = NULL; | ||
8 | +#if 0 | ||
9 | NMActRequest *best_req4 = NULL; | ||
10 | NMActRequest *best_req6 = NULL; | ||
11 | const char *dhcp_hostname, *p; | ||
12 | +#endif | ||
13 | |||
14 | g_return_if_fail (policy != NULL); | ||
15 | |||
16 | @@ -296,6 +298,7 @@ | ||
17 | return; | ||
18 | } | ||
19 | |||
20 | +#if 0 | ||
21 | /* Try automatically determined hostname from the best device's IP config */ | ||
22 | if (!best4) | ||
23 | best4 = get_best_ip4_device (policy->manager, &best_req4); | ||
24 | @@ -349,6 +352,7 @@ | ||
25 | } | ||
26 | } | ||
27 | } | ||
28 | +#endif | ||
29 | |||
30 | /* If no automatically-configured hostname, try using the hostname from | ||
31 | * when NM started up. |