summaryrefslogtreecommitdiffstats
path: root/lib/param/loadparm.c
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-25 15:47:02 +1300
committerJeremy Allison <jra@samba.org>2014-05-07 19:49:17 +0200
commit20159a5b640dd7fe5a626d63dde34a2eff6a9625 (patch)
tree5b5104c6912fb6c45ccf4c0e11dd81ae1cfc8b3f /lib/param/loadparm.c
parentaea7d62b1abe740380f39a642ad20d91ec4073ea (diff)
downloadsamba-20159a5b640dd7fe5a626d63dde34a2eff6a9625.tar.gz
samba-20159a5b640dd7fe5a626d63dde34a2eff6a9625.tar.xz
samba-20159a5b640dd7fe5a626d63dde34a2eff6a9625.zip
lib/param: use strwicmp instead of strlower_talloc
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/param/loadparm.c')
-rw-r--r--lib/param/loadparm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 26860515c8e..b6f1f85a6ec 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -244,7 +244,6 @@ const char *lpcfg_get_parametric(struct loadparm_context *lp_ctx,
struct loadparm_service *service,
const char *type, const char *option)
{
- char *vfskey_tmp = NULL;
char *vfskey = NULL;
struct parmlist_entry *data;
@@ -257,13 +256,14 @@ const char *lpcfg_get_parametric(struct loadparm_context *lp_ctx,
data = (service == NULL ? lp_ctx->globals->param_opt : service->param_opt);
- vfskey_tmp = talloc_asprintf(NULL, "%s:%s", type, option);
- if (vfskey_tmp == NULL) return NULL;
- vfskey = strlower_talloc(NULL, vfskey_tmp);
- talloc_free(vfskey_tmp);
+ vfskey = talloc_asprintf(NULL, "%s:%s", type, option);
+ if (vfskey == NULL) {
+ DEBUG(0,("asprintf failed!\n"));
+ return NULL;
+ }
while (data) {
- if (strcmp(data->key, vfskey) == 0) {
+ if (strwicmp(data->key, vfskey) == 0) {
talloc_free(vfskey);
return data->value;
}
@@ -275,7 +275,7 @@ const char *lpcfg_get_parametric(struct loadparm_context *lp_ctx,
/* but only if we are not already working with globals */
for (data = lp_ctx->globals->param_opt; data;
data = data->next) {
- if (strcmp(data->key, vfskey) == 0) {
+ if (strwicmp(data->key, vfskey) == 0) {
talloc_free(vfskey);
return data->value;
}