r10315: Remove use of fstring and pstring in dynconfig.c

Remove unused includes of dynconfig.h

diff --git a/source/client/client.c b/source/client/client.c
index eb090aea74e7a80c62a1e434efbb4bbeb8fa7287..58fb8cc3509d3397a8a7c04bd85cf5ece7531118 100644 (file)
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -23,7 +23,6 @@
 
 #include "includes.h"
 #include "version.h"
-#include "dynconfig.h"
 #include "clilist.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"

diff --git a/source/dynconfig.c b/source/dynconfig.c
index 50dadee91e5a94aa822b9e84acc5e60309f9c2a0..096819f822c6eb0ba934636afe243f345206ee9a 100644 (file)
--- a/source/dynconfig.c
+++ b/source/dynconfig.c
@@ -44,7 +44,7 @@
 const char *dyn_SBINDIR = SBINDIR,
        *dyn_BINDIR = BINDIR;
 
-pstring dyn_CONFIGFILE = CONFIGFILE; /**< Location of smb.conf file. **/
+const char *dyn_CONFIGFILE = CONFIGFILE; /**< Location of smb.conf file. **/
 
 /** Log file directory. **/
 const char *dyn_LOGFILEBASE = LOGFILEBASE;
@@ -52,24 +52,24 @@ const char *dyn_LOGFILEBASE = LOGFILEBASE;
 const char *dyn_NCALRPCDIR = NCALRPCDIR;
 
 /** Statically configured LanMan hosts. **/
-pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
+const char *dyn_LMHOSTSFILE = LMHOSTSFILE;
 
 /**
  * @brief Samba library directory.
  *
  * @sa lib_path() to get the path to a file inside the LIBDIR.
  **/
-pstring dyn_LIBDIR = LIBDIR;
-const fstring dyn_SHLIBEXT = SHLIBEXT;
+const char *dyn_LIBDIR = LIBDIR;
+const char *dyn_SHLIBEXT = SHLIBEXT;
 
 /**
  * @brief Directory holding lock files.
  *
  * Not writable, but used to set a default in the parameter table.
  **/
-const pstring dyn_LOCKDIR = LOCKDIR;
-const pstring dyn_PIDDIR  = PIDDIR;
+const char *dyn_LOCKDIR = LOCKDIR;
+const char *dyn_PIDDIR  = PIDDIR;
 
-const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
-const pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
-const pstring dyn_SWATDIR = SWATDIR;
+const char *dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
+const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
+const char *dyn_SWATDIR = SWATDIR;

diff --git a/source/include/dynconfig.h b/source/include/dynconfig.h
index 0692f5b932ff2368be1c60300fa5ad549faca8c5..303ac1b6a431fee712eaf017a2559cdd523791eb 100644 (file)
--- a/source/include/dynconfig.h
+++ b/source/include/dynconfig.h
@@ -25,19 +25,15 @@
  * @brief Exported global configurations.
  **/
 
-#include "pstring.h"
-
-extern char const *dyn_SBINDIR,
-       *dyn_BINDIR;
-
-extern pstring dyn_CONFIGFILE;
+extern const char *dyn_SBINDIR, *dyn_BINDIR;
+extern const char *dyn_CONFIGFILE;
 extern const char *dyn_NCALRPCDIR;
 extern const char *dyn_LOGFILEBASE;
-extern pstring 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 const pstring dyn_SWATDIR;
+extern const char *dyn_LMHOSTSFILE;
+extern const char *dyn_LIBDIR;
+extern const char *dyn_SHLIBEXT;
+extern const char *dyn_LOCKDIR; 
+extern const char *dyn_PIDDIR;
+extern const char *dyn_SMB_PASSWD_FILE;
+extern const char *dyn_PRIVATE_DIR;
+extern const char *dyn_SWATDIR;

diff --git a/source/ldap_server/ldap_hacked_ldb.c b/source/ldap_server/ldap_hacked_ldb.c
index 24e2163e48848808de6899f90458fcbd29f7f2d2..8923bc5a1b8da17077178683232de743d8b55599 100644 (file)
--- a/source/ldap_server/ldap_hacked_ldb.c
+++ b/source/ldap_server/ldap_hacked_ldb.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "ldap_server/ldap_server.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_security.h"

diff --git a/source/ldap_server/ldap_rootdse.c b/source/ldap_server/ldap_rootdse.c
index 568623f23dcb86029c2ca460bf3541e7e9b1e134..2392f23799d5b5c8887d4141d8c4b5f0e5624317 100644 (file)
--- a/source/ldap_server/ldap_rootdse.c
+++ b/source/ldap_server/ldap_rootdse.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "ldap_server/ldap_server.h"
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"

diff --git a/source/lib/util.c b/source/lib/util.c
index 2e0503b0d96ab2692843577042136ba53e9aaead..a1d6f85eb93664308584b97e78d62028fc7f2173 100644 (file)
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -703,18 +703,6 @@ char *smbd_tmp_path(TALLOC_CTX *mem_ctx, const char *name)
        return fname;
 }
 
-/**
- * @brief Returns the platform specific shared library extension.
- *
- * @retval Pointer to a static #fstring containing the extension.
- **/
-
-const char *shlib_ext(void)
-{
-  return dyn_SHLIBEXT;
-}
-
-
 void dump_data_pw(const char *msg, const uint8_t * data, size_t len)
 {
 #ifdef DEBUG_PASSWORD

diff --git a/source/smbd/server.c b/source/smbd/server.c
index a176b59d8d1ca887f636e318be127cdc7bb81ec6..93399b15f378a73bc2700a2aee551e8f397daf6b 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -26,7 +26,6 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "version.h"
-#include "dynconfig.h"
 #include "lib/cmdline/popt_common.h"
 #include "system/dir.h"
 #include "system/filesys.h"

diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index 8b0e995b4474b466111feadb504c89eaeb68f897..8a2bba8497d0e84b66456cfe772dfe78bd9c9c30 100644 (file)
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "request.h"

diff --git a/source/torture/locktest.c b/source/torture/locktest.c
index 65fadfcc7d8af0d181374e53e15bf44ca694ec3a..be363d0cb3942cd4eefc686a94bdab9c9bd82322 100644 (file)
--- a/source/torture/locktest.c
+++ b/source/torture/locktest.c
@@ -20,8 +20,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dynconfig.h"
 #include "system/time.h"
+#include "pstring.h"
 
 static int numops = 1000;
 static BOOL showall;

diff --git a/source/torture/masktest.c b/source/torture/masktest.c
index 8b1c0699ee81e4be9a9e7bfc9bc7e658d5698e19..0b1c58a2f257e8596b450f9972f180a769052434 100644 (file)
--- a/source/torture/masktest.c
+++ b/source/torture/masktest.c
@@ -20,10 +20,10 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dynconfig.h"
 #include "clilist.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "pstring.h"
 
 static struct cli_credentials *credentials;
 static BOOL showall = False;

diff --git a/source/torture/torture.c b/source/torture/torture.c
index d4129834dadcfe4306338b7f7a9756626e2002e1..e60f1caf78ddcee8714a857d28d38079812c166e 100644 (file)
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "clilist.h"
 #include "lib/cmdline/popt_common.h"
 #include "libcli/raw/libcliraw.h"

diff --git a/source/utils/nmblookup.c b/source/utils/nmblookup.c
index b74a86d345d69a619bcb0700cc1ba270d0252ae7..466c7d5382db7e19cf8f274614972e13be84cf86 100644 (file)
--- a/source/utils/nmblookup.c
+++ b/source/utils/nmblookup.c
@@ -23,7 +23,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "libcli/nbt/libnbt.h"
 #include "lib/cmdline/popt_common.h"
 #include "system/iconv.h"

diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c
index fe29cff021e8b45eff8e3ea8b3373827f4c89f55..5d46e9aad44ebb08c983fae6a1b94bb27d677f97 100644 (file)
--- a/source/utils/ntlm_auth.c
+++ b/source/utils/ntlm_auth.c
@@ -23,7 +23,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "system/filesys.h"
 #include "system/passwd.h"
 #include "lib/cmdline/popt_common.h"