fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-03 18:17:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-12-01 Dan Williams <dcbw@redhat.com>

Browse source 
* system-settings/plugins/ifcfg/parser.c
		- (parser_parse_file): don't try to verify NULL connections



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3121 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-12-01 17:24:57 +00:00
parent bb8bde197e
commit 8be9677211
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-12-01 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/ifcfg/parser.c
- (parser_parse_file): don't try to verify NULL connections
2007-12-01 Dan Williams <dcbw@redhat.com>
* system-settings/src/main.c

20
system-settings/plugins/ifcfg/parser.c
View file

@ -618,6 +618,7 @@ parser_parse_file (const char *file, GError **error)
shvarFile *parsed;
char *type;
char *nmc = NULL;
NMSetting *s_ip4;
g_return_val_if_fail (file != NULL, NULL);
@ -662,17 +663,16 @@ parser_parse_file (const char *file, GError **error)
g_free (type);
if (connection) {
NMSetting *s_ip4;
if (!connection)
goto done;
s_ip4 = make_ip4_setting (parsed, error);
if (*error) {
g_object_unref (connection);
connection = NULL;
goto done;
} else if (s_ip4) {
nm_connection_add_setting (connection, s_ip4);
}
s_ip4 = make_ip4_setting (parsed, error);
if (*error) {
g_object_unref (connection);
connection = NULL;
goto done;
} else if (s_ip4) {
nm_connection_add_setting (connection, s_ip4);
}
if (!nm_connection_verify (connection)) {