chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dhcp: fix creation of req_opts array
[elogind.git]
/
src
/
network
/
networkd-bridge.c
diff --git
a/src/network/networkd-bridge.c
b/src/network/networkd-bridge.c
index 2c541463ec9d3a4890fab36e4ebf79b56beeb2b3..f110b8aa12c770adb5937b23ef40223b5394a49d 100644
(file)
--- a/
src/network/networkd-bridge.c
+++ b/
src/network/networkd-bridge.c
@@
-139,8
+139,8
@@
static int bridge_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda
if (bridge->link)
bridge_enter_ready(bridge);
if (bridge->link)
bridge_enter_ready(bridge);
-
- bridge->state = BRIDGE_STATE_CREATED;
+ else
+
bridge->state = BRIDGE_STATE_CREATED;
return 1;
}
return 1;
}
@@
-246,6
+246,9
@@
static int bridge_load_one(Manager *manager, const char *filename) {
_cleanup_fclose_ FILE *file = NULL;
int r;
_cleanup_fclose_ FILE *file = NULL;
int r;
+ assert(manager);
+ assert(filename);
+
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)