sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

s3:smbstatus: Use cmdline_messaging_context

Browse Source 
Use cmdline_messaging_context to initialize a messaging context instead
of open coding the same steps.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13465

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit d7fa3815a83a50fd9e3d78cac0d5ef3eb79235e5)
This commit is contained in:
Christof Schmitt 2018-08-20 15:46:27 -07:00 committed by Karolin Seeger
parent 49f962f515
commit 55886f7855
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/utils/status.c
View File

@ -48,6 +48,7 @@
#include "serverid.h"
#include "status_profile.h"
#include "smbd/notifyd/notifyd.h"
#include "cmdline_contexts.h"
#define SMB_MAXPIDS 2048
static uid_t Ucrit_uid = 0; /* added by OH */
@ -528,7 +529,6 @@ int main(int argc, const char *argv[])
};
TALLOC_CTX *frame = talloc_stackframe();
int ret = 0;
struct tevent_context *ev;
struct messaging_context *msg_ctx = NULL;
char *db_path;
bool ok;
@ -607,28 +607,9 @@ int main(int argc, const char *argv[])
d_printf("using configfile = %s\n", get_dyn_CONFIGFILE());
}
if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n",
get_dyn_CONFIGFILE());
ret = -1;
goto done;
}
/*
* This implicitly initializes the global ctdbd connection,
* usable by the db_open() calls further down.
*/
ev = samba_tevent_context_init(NULL);
if (ev == NULL) {
fprintf(stderr, "samba_tevent_context_init failed\n");
ret = -1;
goto done;
}
msg_ctx = messaging_init(NULL, ev);
msg_ctx = cmdline_messaging_context(get_dyn_CONFIGFILE());
if (msg_ctx == NULL) {
fprintf(stderr, "messaging_init failed\n");
fprintf(stderr, "Could not initialize messaging, not root?\n");
ret = -1;
goto done;
}

1
source3/wscript_build
View File

@ -1157,6 +1157,7 @@ bld.SAMBA3_BINARY('smbstatus',
talloc
smbconf
popt_samba3
cmdline_contexts
smbd_base
LOCKING
PROFILE