diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-29 20:20:25 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-03-29 21:34:29 +1100 |
| commit | b60da39da6e1d1025de4bb200f39f9821f01c1d6 (patch) | |
| tree | 0b24311524a1eb8d721ae842d45c3fce783b93a3 | |
| parent | 61106c056898aa8e5dd580b83fa404f12cfccd28 (diff) | |
| download | samba-b60da39da6e1d1025de4bb200f39f9821f01c1d6.tar.gz samba-b60da39da6e1d1025de4bb200f39f9821f01c1d6.tar.bz2 samba-b60da39da6e1d1025de4bb200f39f9821f01c1d6.zip | |
s4: added a simple implementation of bin/samba -b
this shows the config paths. Useful for debugging --enable-fhs
| -rw-r--r-- | source4/smbd/server.c | 45 |
1 files changed, 44 insertions, 1 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c index a09da3ce76..13b56086f4 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -40,6 +40,7 @@ #include "lib/messaging/irpc.h" #include "librpc/gen_ndr/ndr_irpc.h" #include "cluster/cluster.h" +#include "dynconfig/dynconfig.h" /* recursively delete a directory tree @@ -232,6 +233,43 @@ static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx, } +/* + show build info + */ +static void show_build(void) +{ +#define CONFIG_OPTION(n) { #n, dyn_ ## n } + struct { + const char *name; + const char *value; + } config_options[] = { + CONFIG_OPTION(BINDIR), + CONFIG_OPTION(SBINDIR), + CONFIG_OPTION(CONFIGFILE), + CONFIG_OPTION(NCALRPCDIR), + CONFIG_OPTION(LOGFILEBASE), + CONFIG_OPTION(LMHOSTSFILE), + CONFIG_OPTION(DATADIR), + CONFIG_OPTION(MODULESDIR), + CONFIG_OPTION(LOCKDIR), + CONFIG_OPTION(PIDDIR), + CONFIG_OPTION(PRIVATE_DIR), + CONFIG_OPTION(SWATDIR), + CONFIG_OPTION(SETUPDIR), + CONFIG_OPTION(WINBINDD_SOCKET_DIR), + CONFIG_OPTION(WINBINDD_PRIVILEGED_SOCKET_DIR), + CONFIG_OPTION(NTP_SIGND_SOCKET_DIR), + { NULL, NULL} + }; + int i; + + printf("Paths:\n"); + for (i=0; config_options[i].name; i++) { + printf(" %s: %s\n", config_options[i].name, config_options[i].value); + } + + exit(0); +} /* main server. @@ -268,7 +306,8 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ enum { OPT_DAEMON = 1000, OPT_INTERACTIVE, - OPT_PROCESS_MODEL + OPT_PROCESS_MODEL, + OPT_SHOW_BUILD }; struct poptOption long_options[] = { POPT_AUTOHELP @@ -280,6 +319,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ "Select process model", "MODEL"}, {"maximum-runtime",0, POPT_ARG_INT, &max_runtime, 0, "set maximum runtime of the server process, till autotermination", "seconds"}, + {"show-build", 'b', POPT_ARG_NONE, NULL, OPT_SHOW_BUILD, "show build info", NULL }, POPT_COMMON_SAMBA POPT_COMMON_VERSION { NULL } @@ -297,6 +337,9 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ case OPT_PROCESS_MODEL: model = poptGetOptArg(pc); break; + case OPT_SHOW_BUILD: + show_build(); + break; default: fprintf(stderr, "\nInvalid option %s: %s\n\n", poptBadOption(pc, 0), poptStrerror(opt)); |