diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/dynconfig.h | 10 | ||||
| -rw-r--r-- | source3/include/popt_common.h | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h index a74d77e41f..aebc9c941e 100644 --- a/source3/include/dynconfig.h +++ b/source3/include/dynconfig.h @@ -31,8 +31,8 @@ extern char const *dyn_SBINDIR, extern pstring dyn_CONFIGFILE; extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE; extern pstring dyn_LIBDIR; -extern const fstring dyn_SHLIBEXT; -extern const pstring dyn_LOCKDIR; -extern const pstring dyn_PIDDIR; -extern const pstring dyn_SMB_PASSWD_FILE; -extern const pstring dyn_PRIVATE_DIR; +extern fstring dyn_SHLIBEXT; +extern pstring dyn_LOCKDIR; +extern pstring dyn_PIDDIR; +extern pstring dyn_SMB_PASSWD_FILE; +extern pstring dyn_PRIVATE_DIR; diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h index 7c0a86836d..4c3facb48f 100644 --- a/source3/include/popt_common.h +++ b/source3/include/popt_common.h @@ -28,6 +28,7 @@ extern struct poptOption popt_common_samba[]; extern struct poptOption popt_common_connection[]; extern struct poptOption popt_common_version[]; extern struct poptOption popt_common_credentials[]; +extern const struct poptOption popt_common_dynconfig[]; #ifndef POPT_TABLEEND #define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL } @@ -37,6 +38,9 @@ extern struct poptOption popt_common_credentials[]; #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_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, \ + "Build-time configuration overrides:", NULL }, struct user_auth_info { pstring username; |