s3: daemons - ensure nmbd and winbindd are consistent in command line processing...

Bug #10711 - nmbd fails to accept --piddir option.

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

Signed-off-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index c924dd45ba2b7b0da9343336e8bc5c8252500c2c..6990ae782db973fce2ba5302f6ac44a69728e894 100644 (file)
--- 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 69aa9a72f71fd239934bb950ddf5afe10a823808..c481509a7999cc1f90ed72041f6abf1e343dfe82 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1333,6 +1333,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;