diff options
| author | Michael Adam <obnox@samba.org> | 2008-04-13 15:31:02 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-04-13 15:33:48 +0200 |
| commit | 281e610ff31edff43dabe4ee9eb3e7b840fad204 (patch) | |
| tree | b79f496416340bb5526da84358da33979ea1e677 | |
| parent | 6c66d5d0197e6b598e088e863aaaa29c7ca31db2 (diff) | |
| download | samba-281e610ff31edff43dabe4ee9eb3e7b840fad204.tar.gz samba-281e610ff31edff43dabe4ee9eb3e7b840fad204.tar.bz2 samba-281e610ff31edff43dabe4ee9eb3e7b840fad204.zip | |
registry: change init_registry() to return WERROR instead of bool.
Michael
(This used to be commit 0b196095dbbc29c796cb0742fe6e57a421e9596b)
| -rw-r--r-- | source3/registry/reg_init_full.c | 7 | ||||
| -rw-r--r-- | source3/smbd/server.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c index ae12e30766..7b9583dde2 100644 --- a/source3/registry/reg_init_full.c +++ b/source3/registry/reg_init_full.c @@ -62,11 +62,10 @@ REGISTRY_HOOK reg_hooks[] = { with all available backens. ***********************************************************************/ -bool init_registry( void ) +WERROR init_registry(void) { int i; WERROR werr; - bool ret = false; werr = registry_init_common(); if (!W_ERROR_IS_OK(werr)) { @@ -99,10 +98,8 @@ bool init_registry( void ) eventlog_init_keys(); perfcount_init_keys(); - ret = true; - fail: /* close and let each smbd open up as necessary */ regdb_close(); - return ret; + return werr; } diff --git a/source3/smbd/server.c b/source3/smbd/server.c index bc0d4b70a3..9754fab534 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1323,7 +1323,7 @@ extern void build_options(bool screen); namecache_enable(); - if (!init_registry()) + if (!W_ERROR_IS_OK(init_registry())) exit(1); #if 0 |