diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-03-03 13:35:40 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-03-03 21:36:20 +0000 |
| commit | 5ec5da3f683de88d9aef3e886280af7039163c42 (patch) | |
| tree | 0653c07c7371c52f44e2ce91635b8f186c303a06 /mergecap.c | |
| parent | 894804acd088bdb92345517757bfdc99c91eac4e (diff) | |
Add missing initialization calls.
Do the same thing editcap does; we need to know, for example, whether we
were invoked with elevated privileges, so we know whether to pay
attention to environment variables when loading plugins.
Fix program name, and add a comment from editcap, while we're at it.
Change-Id: Ia092331de129d86783a2600be21cff746d4ed5e3
Reviewed-on: https://code.wireshark.org/review/14334
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c index cfcc1a6d73..56258253ed 100644 --- a/mergecap.c +++ b/mergecap.c @@ -324,9 +324,16 @@ main(int argc, char *argv[]) "%s", get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str); + /* + * Get credential information for later use. + */ + init_process_policies(); + init_open_routines(); + #ifdef HAVE_PLUGINS + /* Register wiretap plugins */ if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) { - g_warning("captype: init_progfile_dir(): %s", init_progfile_dir_error); + g_warning("mergecap: init_progfile_dir(): %s", init_progfile_dir_error); g_free(init_progfile_dir_error); } else { /* Register all the plugin types we have. */ |