diff options
| author | Brad Hards <bradh@frogmouth.net> | 2011-01-02 17:46:14 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-01-03 13:25:04 +0100 |
| commit | 3f9157acaeb3d02632f4e51a33744f3eb7054bf5 (patch) | |
| tree | 06597a3f18e94de04821199f704b865d6049507d | |
| parent | ca47dedaaf635042400d6b7cc720a72ced3e113a (diff) | |
| download | samba-3f9157acaeb3d02632f4e51a33744f3eb7054bf5.tar.gz samba-3f9157acaeb3d02632f4e51a33744f3eb7054bf5.tar.bz2 samba-3f9157acaeb3d02632f4e51a33744f3eb7054bf5.zip | |
s4:dynconfig: Add prototypes to match dynconfig.c
Also, SCRIPTSBINDIR isn't really common with Samba3 dynconfig
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Jan 3 13:25:04 CET 2011 on sn-devel-104
| -rw-r--r-- | source4/dynconfig/dynconfig.c | 4 | ||||
| -rw-r--r-- | source4/dynconfig/dynconfig.h | 52 |
2 files changed, 36 insertions, 20 deletions
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c index ac791411bf..0c23452cc3 100644 --- a/source4/dynconfig/dynconfig.c +++ b/source4/dynconfig/dynconfig.c @@ -40,6 +40,8 @@ * table? There's kind of a chicken-and-egg situation there... **/ +#include "dynconfig.h" + #define DEFINE_DYN_CONFIG_PARAM(name) \ const char *dyn_##name = name; \ \ @@ -66,7 +68,6 @@ const char *dyn_##name = name; \ /* these are in common with s3 */ DEFINE_DYN_CONFIG_PARAM(SBINDIR) -DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR) DEFINE_DYN_CONFIG_PARAM(BINDIR) DEFINE_DYN_CONFIG_PARAM(SWATDIR) DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/ @@ -91,3 +92,4 @@ DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR) DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR) DEFINE_DYN_CONFIG_PARAM(PYTHONDIR) +DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR) diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h index 48b4f54b21..43a373df0a 100644 --- a/source4/dynconfig/dynconfig.h +++ b/source4/dynconfig/dynconfig.h @@ -24,22 +24,36 @@ * @brief Exported global configurations. **/ -extern const char *dyn_BINDIR; -extern const char *dyn_SBINDIR; -extern const char *dyn_SCRIPTSBINDIR; -extern const char *dyn_CONFIGFILE; -extern const char *dyn_NCALRPCDIR; -extern const char *dyn_LOGFILEBASE; -extern const char *dyn_LMHOSTSFILE; -extern const char *dyn_DATADIR; -extern const char *dyn_MODULESDIR; -extern const char *dyn_LOCKDIR; -extern const char *dyn_PIDDIR; -extern const char *dyn_PRIVATE_DIR; -extern const char *dyn_SWATDIR; -extern const char *dyn_JSDIR; -extern const char *dyn_SETUPDIR; -extern const char *dyn_WINBINDD_SOCKET_DIR; -extern const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR; -extern const char *dyn_NTP_SIGND_SOCKET_DIR; -extern const char *dyn_PYTHONDIR; +#define DEFINE_DYN_CONFIG_PROTO(name) \ +const char *dyn_##name; \ +const char *get_dyn_##name(void); \ +const char *set_dyn_##name(const char *newpath); \ +bool is_default_dyn_##name(void); + +/* these are in common with s3 */ +DEFINE_DYN_CONFIG_PROTO(SBINDIR) +DEFINE_DYN_CONFIG_PROTO(BINDIR) +DEFINE_DYN_CONFIG_PROTO(SWATDIR) +DEFINE_DYN_CONFIG_PROTO(CONFIGFILE) /**< Location of smb.conf file. **/ +DEFINE_DYN_CONFIG_PROTO(LOGFILEBASE) /** Log file directory. **/ +DEFINE_DYN_CONFIG_PROTO(LMHOSTSFILE) /** Statically configured LanMan hosts. **/ +DEFINE_DYN_CONFIG_PROTO(CODEPAGEDIR) +DEFINE_DYN_CONFIG_PROTO(LIBDIR) +DEFINE_DYN_CONFIG_PROTO(MODULESDIR) +DEFINE_DYN_CONFIG_PROTO(SHLIBEXT) +DEFINE_DYN_CONFIG_PROTO(LOCKDIR) +DEFINE_DYN_CONFIG_PROTO(STATEDIR) /** Persistent state files. Default LOCKDIR */ +DEFINE_DYN_CONFIG_PROTO(CACHEDIR) /** Temporary cache files. Default LOCKDIR */ +DEFINE_DYN_CONFIG_PROTO(PIDDIR) +DEFINE_DYN_CONFIG_PROTO(NCALRPCDIR) +DEFINE_DYN_CONFIG_PROTO(SMB_PASSWD_FILE) +DEFINE_DYN_CONFIG_PROTO(PRIVATE_DIR) + +/* these are not in s3 */ +DEFINE_DYN_CONFIG_PROTO(DATADIR) +DEFINE_DYN_CONFIG_PROTO(SETUPDIR) +DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR) +DEFINE_DYN_CONFIG_PROTO(WINBINDD_PRIVILEGED_SOCKET_DIR) +DEFINE_DYN_CONFIG_PROTO(NTP_SIGND_SOCKET_DIR) +DEFINE_DYN_CONFIG_PROTO(PYTHONDIR) +DEFINE_DYN_CONFIG_PROTO(SCRIPTSBINDIR)
\ No newline at end of file |