confd: fix update of /cfg/startup-config.cfg

troglobit · troglobit · commit f08947092b1d · 2025-11-05T20:41:59.000+01:00
Follow-up to ed23558 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
diff --git a/src/confd/src/core.c b/src/confd/src/core.c
@@ -262,8 +262,8 @@ static inline int subscribe_model(char *model, struct confd *confd, int flags)
 {
 	return  sr_module_change_subscribe(confd->session, model, "//.", change_cb, confd,
 					   CB_PRIO_PRIMARY, SR_SUBSCR_CHANGE_ALL_MODULES |
-					   SR_SUBSCR_DEFAULT | flags, &confd->sub) &&
-		sr_module_change_subscribe(confd->startup, model, "//.", core_startup_save, NULL,
+					   SR_SUBSCR_DEFAULT | flags, &confd->sub) ||
+		sr_module_change_subscribe(confd->startup, model, "//.", startup_save, NULL,
 					   CB_PRIO_PASSIVE, SR_SUBSCR_CHANGE_ALL_MODULES |
 					   SR_SUBSCR_PASSIVE, &confd->sub);
 }

Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,8 @@ static inline int subscribe_model(char model, struct confd confd, int flags)`
`262`	`262`	`{`
`263`	`263`	`return sr_module_change_subscribe(confd->session, model, "//.", change_cb, confd,`
`264`	`264`	`CB_PRIO_PRIMARY, SR_SUBSCR_CHANGE_ALL_MODULES \|`
`265`		`- SR_SUBSCR_DEFAULT \| flags, &confd->sub) &&`
`266`		`- sr_module_change_subscribe(confd->startup, model, "//.", core_startup_save, NULL,`
	`265`	`+ SR_SUBSCR_DEFAULT \| flags, &confd->sub) \|\|`
	`266`	`+ sr_module_change_subscribe(confd->startup, model, "//.", startup_save, NULL,`
`267`	`267`	`CB_PRIO_PASSIVE, SR_SUBSCR_CHANGE_ALL_MODULES \|`
`268`	`268`	`SR_SUBSCR_PASSIVE, &confd->sub);`
`269`	`269`	`}`