summaryrefslogtreecommitdiffstats
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2014-01-15 17:29:57 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-02-12 13:17:13 +1300
commit0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c (patch)
tree32fd04e3952881feaab0021cb0c289dd29190e6e /source3/include
parentcc6a77835bc286b2e570a05596b3b6acc54c1052 (diff)
downloadsamba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.tar.gz
samba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.tar.xz
samba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.zip
param: No longer have a special case for lp_configfile
This parameter is renamed because it does not normally return the current smb.conf file, but instead returns the next one, as found in a config file = directive, to be loaded. This avoids a conflict with the lpcfg_configfile from lib/param, which does refer to the current smb.conf path. Andrew Bartlett Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e3618dc1f9..315f0254b4 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -987,7 +987,6 @@ NTSTATUS trust_pw_change(struct netlogon_creds_cli_context *context,
#include "source3/param/param_proto.h"
-char *lp_configfile(TALLOC_CTX *ctx);
char *lp_servicename(TALLOC_CTX *ctx, int);
const char *lp_const_servicename(int);
bool lp_autoloaded(int);