comparison: src/server/daemon/configmanager.c
src/server/daemon/configmanager.c
- changeset 392
- 0aef555055ee
- parent 388
- 30d29ef5b79a
- child 415
- d938228c382e
equal
deleted
inserted
replaced
| 391:80ee93a7d257 | 392:0aef555055ee |
|---|---|
| 68 | 68 |
| 69 return 0; | 69 return 0; |
| 70 } | 70 } |
| 71 | 71 |
| 72 int cfgmgr_apply_config(CfgManager *mgr) { | 72 int cfgmgr_apply_config(CfgManager *mgr) { |
| 73 int err = 1; | 73 int err = 0; |
| 74 if(apply_server_conf(mgr)) { | 74 if(apply_server_conf(mgr)) { |
| 75 err = 0; | |
| 76 if(current_config) { | 75 if(current_config) { |
| 77 cfg_unref(current_config); | 76 cfg_unref(current_config); |
| 78 } | 77 } |
| 79 current_config = mgr->cfg; | 78 current_config = mgr->cfg; |
| 79 } else { | |
| 80 err = 1; | |
| 80 } | 81 } |
| 81 | 82 |
| 82 return err; | 83 return err; |
| 83 } | 84 } |
| 84 | 85 |
