summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-13 12:29:54 +0100
committerStefan Metzmacher <metze@samba.org>2011-12-13 17:26:20 +0100
commit3cf275cd754486e07a891fbcb0607afb171d5359 (patch)
treea4e1d5c4ff8497e21c33f3c3a19831ad890cd8d1
parentae7d8778415234eb85df1aceb024875691ccb8ef (diff)
downloadsamba-3cf275cd754486e07a891fbcb0607afb171d5359.tar.gz
samba-3cf275cd754486e07a891fbcb0607afb171d5359.tar.bz2
samba-3cf275cd754486e07a891fbcb0607afb171d5359.zip
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
-rw-r--r--source3/rpc_server/dfs/srv_dfs_nt.c3
-rw-r--r--source3/smbd/msdfs.c3
-rw-r--r--source3/smbd/proto.h3
3 files changed, 3 insertions, 6 deletions
diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
index efb0a1ec0a..0a9a7ccd62 100644
--- 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 5ee7897867..a00fd6f769 100644
--- 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 6d833d7b2d..e0f48b7bcb 100644
--- 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,