sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3/rpc_server: shared rpc modules loading

Browse Source 
The previous commit 58889e04bd545d7420d1193e134351bd0ccb8430 for this
bug was broken as it didn't move the goto into the "if (errno !=
ENOENT)" condition.

This updated fix folds the test "mod_init_fns == NULL" and the check for
the errno into one if condition.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12184

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 9785fe5af6613a728a7d92c82bbc31cabbe3a0b9)
This commit is contained in:
Ralph Boehme 2017-01-30 18:49:39 +01:00 committed by Karolin Seeger
parent d760f75e40
commit d9bad787c8
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/rpc_server/rpc_service_setup.c
View File

@ -535,18 +535,15 @@ bool dcesrv_ep_setup(struct tevent_context *ev_ctx,
/* Initialize shared modules */
mod_init_fns = load_samba_modules(tmp_ctx, "rpc");
if (mod_init_fns == NULL) {
if (errno != ENOENT) {
if ((mod_init_fns == NULL) && (errno != ENOENT)) {
/*
* ENOENT means the directory doesn't exist
* which can happen if all modules are
* static. So ENOENT is ok, everything else is
* ENOENT means the directory doesn't exist which can happen if
* all modules are static. So ENOENT is ok, everything else is
* not ok.
*/
DBG_ERR("Loading shared RPC modules failed [%s]\n",
strerror(errno));
ok = false;
}
goto done;
}