s3/s4: Cleanup. Move TALLOC_CTX * parameter to be first in resolve_lmhosts_file_as_so...

No logic changes.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Isaac Boukris <iboukris@samba.org>

diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index f721278989711d2b7c1b1d15e2f1ca4864bc6e40..496b2b9178376eacd009ad9e517d4fe2e120e4ec 100644 (file)
--- a/libcli/nbt/libnbt.h
+++ b/libcli/nbt/libnbt.h
@@ -367,9 +367,10 @@ bool getlmhostsent(TALLOC_CTX *ctx, FILE *fp, char **pp_name, int *name_type,
                   struct sockaddr_storage *pss);
 void endlmhosts(FILE *fp);
 
-NTSTATUS resolve_lmhosts_file_as_sockaddr(const char *lmhosts_file, 
-                                         const char *name, int name_type,
-                                         TALLOC_CTX *mem_ctx, 
+NTSTATUS resolve_lmhosts_file_as_sockaddr(TALLOC_CTX *mem_ctx,
+                                         const char *lmhosts_file,
+                                         const char *name,
+                                         int name_type,
                                          struct sockaddr_storage **return_iplist,
                                          int *return_count);
 

diff --git a/libcli/nbt/lmhosts.c b/libcli/nbt/lmhosts.c
index f47d8b9804fb7c20bc71da4415b08d999e449209..0890c0407d390d7e51e6348bf3626b8b6c059cfe 100644 (file)
--- a/libcli/nbt/lmhosts.c
+++ b/libcli/nbt/lmhosts.c
@@ -159,9 +159,10 @@ void endlmhosts(FILE *fp)
  Resolve via "lmhosts" method.
 *********************************************************/
 
-NTSTATUS resolve_lmhosts_file_as_sockaddr(const char *lmhosts_file,
-                                         const char *name, int name_type,
-                                         TALLOC_CTX *mem_ctx,
+NTSTATUS resolve_lmhosts_file_as_sockaddr(TALLOC_CTX *mem_ctx,
+                                         const char *lmhosts_file,
+                                         const char *name,
+                                         int name_type,
                                          struct sockaddr_storage **return_iplist,
                                          int *return_count)
 {

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 1a54f8e5c969b867463223c7f61155fa7ac49ccf..68a3d237e710e0888890c55fc4638b66bce8c7ab 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -2721,10 +2721,10 @@ NTSTATUS internal_resolve_name(const char *name,
                } else if (strequal(tok, "lmhosts")) {
                        struct sockaddr_storage *ss_list;
                        status = resolve_lmhosts_file_as_sockaddr(
+                               talloc_tos(),
                                get_dyn_LMHOSTSFILE(),
                                name,
                                name_type,
-                               talloc_tos(),
                                &ss_list,
                                return_count);
                        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source4/libcli/resolve/lmhosts.c b/source4/libcli/resolve/lmhosts.c
index 10e1f3d2a9d7f1225140fb3892854c8e9043a25d..0f2cf99b459e627907ff979a6252e712cbc0ac77 100644 (file)
--- a/source4/libcli/resolve/lmhosts.c
+++ b/source4/libcli/resolve/lmhosts.c
@@ -68,8 +68,12 @@ static struct composite_context *resolve_name_lmhosts_send(
        if (composite_nomem(state, c)) return c;
        c->private_data = state;
 
-       c->status = resolve_lmhosts_file_as_sockaddr(dyn_LMHOSTSFILE, name->name, name->type,
-                                                    state, &resolved_iplist, &resolved_count);
+       c->status = resolve_lmhosts_file_as_sockaddr(state,
+                                                    dyn_LMHOSTSFILE,
+                                                    name->name,
+                                                    name->type,
+                                                    &resolved_iplist,
+                                                    &resolved_count);
        if (!composite_is_ok(c)) return c;
 
        for (i=0; i < resolved_count; i += 2) {