diff options
| author | Volker Lendecke <vl@samba.org> | 2011-09-24 05:42:48 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-09-26 14:59:12 +0200 |
| commit | fba833d0557969fe0c1c943465c1b1f833fe1bdb (patch) | |
| tree | d913f50b57386af5b9dd693d7b60365069d6cafe /source3/smbd | |
| parent | cb2b5c521b2c13b6b453e0f4d7db8845da1fa1cf (diff) | |
| download | samba-fba833d0557969fe0c1c943465c1b1f833fe1bdb.tar.gz samba-fba833d0557969fe0c1c943465c1b1f833fe1bdb.tar.bz2 samba-fba833d0557969fe0c1c943465c1b1f833fe1bdb.zip | |
s3: Remove the smbd_server_conn ref from get_referred_path
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/msdfs.c | 11 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index abb0ebce5c..9602e792ac 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -850,6 +850,7 @@ static NTSTATUS self_ref(TALLOC_CTX *ctx, NTSTATUS get_referred_path(TALLOC_CTX *ctx, const char *dfs_path, + struct smbd_server_connection *sconn, struct junction_map *jucn, int *consumedcntp, bool *self_referralp) @@ -868,8 +869,8 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx, *self_referralp = False; - status = parse_dfs_path(NULL, dfs_path, False, - !smbd_server_conn->using_smb2, pdp, &dummy); + status = parse_dfs_path(NULL, dfs_path, False, !sconn->using_smb2, + pdp, &dummy); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -972,7 +973,7 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx, return NT_STATUS_OK; } - status = create_conn_struct(ctx, smbd_server_conn, &conn, snum, + status = create_conn_struct(ctx, sconn, &conn, snum, lp_pathname(snum), NULL, &oldpath); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(pdp); @@ -1276,8 +1277,8 @@ int setup_dfs_referral(connection_struct *orig_conn, } /* The following call can change cwd. */ - *pstatus = get_referred_path(ctx, pathnamep, junction, - &consumedcnt, &self_referral); + *pstatus = get_referred_path(ctx, pathnamep, smbd_server_conn, + junction, &consumedcnt, &self_referral); if (!NT_STATUS_IS_OK(*pstatus)) { vfs_ChDir(orig_conn,orig_conn->connectpath); talloc_destroy(ctx); diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index ab7d0a8013..1c8fd1f556 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -448,6 +448,7 @@ bool is_msdfs_link(connection_struct *conn, struct junction_map; NTSTATUS get_referred_path(TALLOC_CTX *ctx, const char *dfs_path, + struct smbd_server_connection *sconn, struct junction_map *jucn, int *consumedcntp, bool *self_referralp); |