From: Jeremy Allison <jra@samba.org>
Date: Mon, 14 Jul 2014 23:13:24 +0000 (-0700)
Subject: s3: daemons - ensure nmbd and winbindd are consistent in command line processing... 
X-Git-Tag: samba-4.0.23~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ec015ba04ae821b99d99201bd8d80f09c7fe4e8;p=thirdparty%2Fsamba.git

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 <jra@samba.org>
---

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index c924dd45ba2..6990ae782db 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 69aa9a72f71..c481509a799 100644
--- 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;