s3:smbd/msdfs: enum_msdfs_links() doesn't need a smbd_server_connection anymore

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Dec 13 17:26:20 CET 2011 on sn-devel-104

diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
index efb0a1ec0a06c920f085f25b7313a5258e6775fc..0a9a7ccd62c35b3ef5e9814f3e732b36d0bdcada 100644 (file)
--- a/source3/rpc_server/dfs/srv_dfs_nt.c
+++ b/source3/rpc_server/dfs/srv_dfs_nt.c
@@ -281,8 +281,7 @@ WERROR _dfs_Enum(struct pipes_struct *p, struct dfs_Enum *r)
        size_t i;
        TALLOC_CTX *ctx = talloc_tos();
 
-       jn = enum_msdfs_links(msg_ctx_to_sconn(p->msg_ctx),
-                             ctx, &num_jn);
+       jn = enum_msdfs_links(ctx, &num_jn);
        if (!jn || num_jn == 0) {
                num_jn = 0;
                jn = NULL;

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 5ee78978672b4a4718234c8b1f57e5596bcc31bf..a00fd6f7692a190ec9a238106c9c2cf4dc2ad798 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1475,8 +1475,7 @@ out:
        return cnt;
 }
 
-struct junction_map *enum_msdfs_links(struct smbd_server_connection *sconn,
-                                     TALLOC_CTX *ctx, size_t *p_num_jn)
+struct junction_map *enum_msdfs_links(TALLOC_CTX *ctx, size_t *p_num_jn)
 {
        struct junction_map *jn = NULL;
        int i=0;

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 6d833d7b2d533bf3a6e05729499abe9634f10573..e0f48b7bcbfcbd84b57da7decf24bf72cc06f1e8 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -459,8 +459,7 @@ bool create_junction(TALLOC_CTX *ctx,
                struct junction_map *jucn);
 bool create_msdfs_link(const struct junction_map *jucn);
 bool remove_msdfs_link(const struct junction_map *jucn);
-struct junction_map *enum_msdfs_links(struct smbd_server_connection *sconn,
-                                     TALLOC_CTX *ctx, size_t *p_num_jn);
+struct junction_map *enum_msdfs_links(TALLOC_CTX *ctx, size_t *p_num_jn);
 NTSTATUS resolve_dfspath(TALLOC_CTX *ctx,
                        connection_struct *conn,
                        bool dfs_pathnames,