From 349294d358481e1af460d1ade97987474dad9e43 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 19 Sep 2005 12:58:43 +0000
Subject: r10315: Remove use of fstring and pstring in dynconfig.c Remove
 unused includes of dynconfig.h (This used to be commit
 59083b7ba60d518ddb59646c4fd69938afd079b3)

---
 source4/client/client.c               |  1 -
 source4/dynconfig.c                   | 18 +++++++++---------
 source4/include/dynconfig.h           | 24 ++++++++++--------------
 source4/ldap_server/ldap_hacked_ldb.c |  1 -
 source4/ldap_server/ldap_rootdse.c    |  1 -
 source4/lib/util.c                    | 12 ------------
 source4/smbd/server.c                 |  1 -
 source4/torture/gentest.c             |  1 -
 source4/torture/locktest.c            |  2 +-
 source4/torture/masktest.c            |  2 +-
 source4/torture/torture.c             |  1 -
 source4/utils/nmblookup.c             |  1 -
 source4/utils/ntlm_auth.c             |  1 -
 13 files changed, 21 insertions(+), 45 deletions(-)

(limited to 'source4')

diff --git a/source4/client/client.c b/source4/client/client.c
index eb090aea74e..58fb8cc3509 100644
--- a/source4/client/client.c
+++ b/source4/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/source4/dynconfig.c b/source4/dynconfig.c
index 50dadee91e5..096819f822c 100644
--- a/source4/dynconfig.c
+++ b/source4/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/source4/include/dynconfig.h b/source4/include/dynconfig.h
index 0692f5b932f..303ac1b6a43 100644
--- a/source4/include/dynconfig.h
+++ b/source4/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/source4/ldap_server/ldap_hacked_ldb.c b/source4/ldap_server/ldap_hacked_ldb.c
index 24e2163e488..8923bc5a1b8 100644
--- a/source4/ldap_server/ldap_hacked_ldb.c
+++ b/source4/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/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c
index 568623f23dc..2392f23799d 100644
--- a/source4/ldap_server/ldap_rootdse.c
+++ b/source4/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/source4/lib/util.c b/source4/lib/util.c
index 2e0503b0d96..a1d6f85eb93 100644
--- a/source4/lib/util.c
+++ b/source4/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/source4/smbd/server.c b/source4/smbd/server.c
index a176b59d8d1..93399b15f37 100644
--- a/source4/smbd/server.c
+++ b/source4/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/source4/torture/gentest.c b/source4/torture/gentest.c
index 8b0e995b447..8a2bba8497d 100644
--- a/source4/torture/gentest.c
+++ b/source4/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/source4/torture/locktest.c b/source4/torture/locktest.c
index 65fadfcc7d8..be363d0cb39 100644
--- a/source4/torture/locktest.c
+++ b/source4/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/source4/torture/masktest.c b/source4/torture/masktest.c
index 8b1c0699ee8..0b1c58a2f25 100644
--- a/source4/torture/masktest.c
+++ b/source4/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/source4/torture/torture.c b/source4/torture/torture.c
index d4129834dad..e60f1caf78d 100644
--- a/source4/torture/torture.c
+++ b/source4/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/source4/utils/nmblookup.c b/source4/utils/nmblookup.c
index b74a86d345d..466c7d5382d 100644
--- a/source4/utils/nmblookup.c
+++ b/source4/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/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index fe29cff021e..5d46e9aad44 100644
--- a/source4/utils/ntlm_auth.c
+++ b/source4/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"
-- 
cgit