mirror of
https://github.com/samba-team/samba.git
synced 2025-01-21 18:04:06 +03:00
ctdb-conf: Rename config loading to not be daemon-specific
We might end up using it elsewhere. Signed-off-by: Martin Schwenke <mschwenke@ddn.com> Reviewed-by: Guenther Deschner <gd@samba.org> Reviewed-by: Anoop C S <anoopcs@samba.org>
This commit is contained in:
parent
cf25243421
commit
11c4b25331
@ -133,8 +133,8 @@ static void setup_config_pointers(struct conf_context *conf)
|
||||
&ctdb_config.script_log_level);
|
||||
}
|
||||
|
||||
int ctdbd_config_load(TALLOC_CTX *mem_ctx,
|
||||
struct conf_context **result)
|
||||
int ctdb_config_load(TALLOC_CTX *mem_ctx,
|
||||
struct conf_context **result)
|
||||
{
|
||||
struct conf_context *conf = NULL;
|
||||
int ret = 0;
|
||||
|
@ -54,6 +54,6 @@ struct ctdb_config {
|
||||
|
||||
extern struct ctdb_config ctdb_config;
|
||||
|
||||
int ctdbd_config_load(TALLOC_CTX *mem_ctx, struct conf_context **conf);
|
||||
int ctdb_config_load(TALLOC_CTX *mem_ctx, struct conf_context **conf);
|
||||
|
||||
#endif /* __CTDB_CONFIG_H__ */
|
||||
|
@ -232,9 +232,9 @@ int main(int argc, const char *argv[])
|
||||
* Configuration file handling
|
||||
*/
|
||||
|
||||
ret = ctdbd_config_load(ctdb, &conf);
|
||||
ret = ctdb_config_load(ctdb, &conf);
|
||||
if (ret != 0) {
|
||||
/* ctdbd_config_load() logs the failure */
|
||||
/* ctdb_config_load() logs the failure */
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user