unix_msg: Use struct initializers

[kamenim/samba-autobuild/.git] / source3 / smbd / mangle.c

diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index ca1b1314cba88219b68ae3a2a5e2afb0cea60ee7..a8988f0219987e805a9ddd05a8eade9f01823dba 100644 (file)
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "mangle.h"
 
@@ -44,7 +45,7 @@ static void mangle_init(void)
        if (mangle_fns)
                return;
 
-       method = lp_mangling_method();
+       method = lp_mangling_method(talloc_tos());
 
        /* find the first mangling method that manages to initialise and
           matches the "mangling method" parameter */
@@ -103,7 +104,7 @@ bool mangle_is_8_3_wildcards(const char *fname, bool check_case,
 bool mangle_must_mangle(const char *fname,
                   const struct share_params *p)
 {
-       if (!lp_manglednames(p)) {
+       if (!lp_mangled_names(p)) {
                return False;
        }
        return mangle_fns->must_mangle(fname, p);
@@ -139,7 +140,7 @@ bool name_to_8_3(const char *in,
 
        /* name mangling can be disabled for speed, in which case
           we just truncate the string */
-       if (!lp_manglednames(p)) {
+       if (!lp_mangled_names(p)) {
                strlcpy(out, in, 13);
                return True;
        }
@@ -147,6 +148,6 @@ bool name_to_8_3(const char *in,
        return mangle_fns->name_to_8_3(in,
                                out,
                                cache83,
-                               lp_defaultcase(p->service),
+                               lp_default_case(p->service),
                                p);
 }