Revert scanning interval back to 10s, blow away resolv.conf for ad-hoc networks
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@344 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -223,18 +223,16 @@ gboolean nm_system_device_update_resolv_conf (void *data, int len, const char *d
|
||||
{
|
||||
FILE *f;
|
||||
|
||||
g_return_val_if_fail (data != NULL, FALSE);
|
||||
|
||||
if ((f = fopen ("/etc/resolv.conf", "w")))
|
||||
{
|
||||
int i;
|
||||
|
||||
fprintf (f, "; generated by NetworkManager\n");
|
||||
|
||||
if (domain_name)
|
||||
if (domain_name && strlen (domain_name))
|
||||
fprintf (f, "search %s\n", (char *)domain_name);
|
||||
|
||||
for (i = 0; i < len; i += 4)
|
||||
for (i = 0; data && (i < len); i += 4)
|
||||
{
|
||||
fprintf (f,"nameserver %u.%u.%u.%u\n",
|
||||
((unsigned char *)data)[i],
|
||||
|
Reference in New Issue
Block a user