add POPT_COMMON_CONFIGFILE which only provides --configfile (not -s)

metze
(This used to be commit af3392cc20942158ac9e0a533799c5904ff23347)

diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index f77f69dfa4f8756bb136330d027a37c6a377c418..1d3cc57acde68238e6a27fc1c47eedf5728eaec1 100644 (file)
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -25,6 +25,7 @@
 /* Common popt structures */
 extern struct poptOption popt_common_samba[];
 extern struct poptOption popt_common_connection[];
+extern struct poptOption popt_common_configfile[];
 extern struct poptOption popt_common_version[];
 extern struct poptOption popt_common_credentials[];
 extern const struct poptOption popt_common_dynconfig[];
@@ -36,6 +37,7 @@ extern const struct poptOption popt_common_dynconfig[];
 #define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL },
 #define POPT_COMMON_CONNECTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_connection, 0, "Connection options:", NULL },
 #define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL },
+#define POPT_COMMON_CONFIGFILE { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile, 0, "Common samba config:", NULL },
 #define POPT_COMMON_CREDENTIALS { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_credentials, 0, "Authentication options:", NULL },
 #define POPT_COMMON_DYNCONFIG { NULL, 0, POPT_ARG_INCLUDE_TABLE, \
     CONST_DISCARD(poptOption *, popt_common_dynconfig), 0, \

diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index bc67a0fa285eef94c5de35f5b4ba51bd94c5848a..b3a84a6f7cad019ed9c2ae7920d9a1d4a57338db 100644 (file)
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -150,6 +150,12 @@ struct poptOption popt_common_samba[] = {
        POPT_TABLEEND
 };
 
+struct poptOption popt_common_configfile[] = {
+       { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, (void *)popt_common_callback },
+       { "configfile", 0, POPT_ARG_STRING, NULL, 's', "Use alternate configuration file", "CONFIGFILE" },
+       POPT_TABLEEND
+};
+
 struct poptOption popt_common_version[] = {
        { NULL, 0, POPT_ARG_CALLBACK, (void *)popt_common_callback },
        { "version", 'V', POPT_ARG_NONE, NULL, 'V', "Print version" },