diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-11-25 14:24:35 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-11-25 14:24:35 +0100 |
| commit | 04ae8ddaa15b72c265dc7cf038b733d235198754 (patch) | |
| tree | eadc4dfee9a0f0eba3446538129608dffbde4625 /nest/proto.c | |
| parent | d44e686e9bcae5850115c0e1adfe24523dce61ee (diff) | |
| parent | 33b4f40acce02c90b4b7766c5c94ebf2d22765c6 (diff) | |
Merge branch 'master' into int-new
Diffstat (limited to 'nest/proto.c')
| -rw-r--r-- | nest/proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nest/proto.c b/nest/proto.c index 6531083c..d04da333 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -521,7 +521,7 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty WALK_LIST(oc, old->protos) { p = oc->proto; - sym = cf_find_symbol(oc->name); + sym = cf_find_symbol(new, oc->name); if (sym && sym->class == SYM_PROTO && !new->shutdown) { /* Found match, let's check if we can smoothly switch to new configuration */ |