From 5e4f906d4d8bc7b2ed8e3275c80ed3d93b8faae7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 14 Jul 2014 16:13:24 -0700 Subject: [PATCH] s3: daemons - ensure nmbd and winbindd are consistent in command line processing by adding POPT_COMMON_DYNCONFIG. Bug #10711 - nmbd fails to accept --piddir option. https://bugzilla.samba.org/show_bug.cgi?id=10711 Signed-off-by: Jeremy Allison --- source3/nmbd/nmbd.c | 3 ++- source3/winbindd/winbindd.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 36d9082..714dad7 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -798,7 +798,8 @@ static bool open_sockets(bool isdaemon, int port) {"hosts", 'H', POPT_ARG_STRING, &p_lmhosts, 0, "Load a netbios hosts file"}, {"port", 'p', POPT_ARG_INT, &global_nmb_port, 0, "Listen on the specified port" }, POPT_COMMON_SAMBA - { NULL } + POPT_COMMON_DYNCONFIG + POPT_TABLEEND }; TALLOC_CTX *frame; NTSTATUS status; diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 68ffd7e..1e85411 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -1328,6 +1328,7 @@ int main(int argc, char **argv, char **envp) { "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Interactive mode" }, { "no-caching", 'n', POPT_ARG_NONE, NULL, 'n', "Disable caching" }, POPT_COMMON_SAMBA + POPT_COMMON_DYNCONFIG POPT_TABLEEND }; poptContext pc; -- 2.0.0.526.g5318336