sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Add auth_serversupplied_info to create_conn_struct

Browse Source 
srvsvc needs it, as will printing
This commit is contained in:
Volker Lendecke 2008-11-23 22:21:26 +01:00
parent 526c609d5f
commit ed27d91068
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/proto.h
View File

@ -7957,7 +7957,8 @@ NTSTATUS create_conn_struct(TALLOC_CTX *ctx,
connection_struct **pconn,
int snum,
const char *path,
char **poldcwd);
struct auth_serversupplied_info *server_info,
char **poldcwd);
/* The following definitions come from smbd/negprot.c */

10
source3/rpc_server/srv_srvsvc_nt.c
View File

@ -2050,7 +2050,8 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p,
}
nt_status = create_conn_struct(talloc_tos(), &conn, snum,
lp_pathname(snum), &oldcwd);
lp_pathname(snum), p->server_info,
&oldcwd);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(10, ("create_conn_struct failed: %s\n",
nt_errstr(nt_status)));
@ -2058,8 +2059,6 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p,
goto error_exit;
}
conn->server_info = p->server_info;
nt_status = create_file(
conn, /* conn */
NULL, /* req */
@ -2165,7 +2164,8 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p,
}
nt_status = create_conn_struct(talloc_tos(), &conn, snum,
lp_pathname(snum), &oldcwd);
lp_pathname(snum), p->server_info,
&oldcwd);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(10, ("create_conn_struct failed: %s\n",
nt_errstr(nt_status)));
@ -2173,8 +2173,6 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p,
goto error_exit;
}
conn->server_info = p->server_info;
nt_status = create_file(
conn, /* conn */
NULL, /* req */

19
source3/smbd/msdfs.c
View File

@ -219,6 +219,7 @@ NTSTATUS create_conn_struct(TALLOC_CTX *ctx,
connection_struct **pconn,
int snum,
const char *path,
struct auth_serversupplied_info *server_info,
char **poldcwd)
{
connection_struct *conn;
@ -254,6 +255,15 @@ NTSTATUS create_conn_struct(TALLOC_CTX *ctx,
conn->params->service = snum;
if (server_info != NULL) {
conn->server_info = copy_serverinfo(conn, server_info);
if (conn->server_info == NULL) {
DEBUG(0, ("copy_serverinfo failed\n"));
TALLOC_FREE(conn);
return NT_STATUS_NO_MEMORY;
}
}
set_conn_connectpath(conn, connpath);
if (!smbd_vfs_init(conn)) {
@ -881,7 +891,7 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx,
}
status = create_conn_struct(ctx, &conn, snum, lp_pathname(snum),
&oldpath);
NULL, &oldpath);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(pdp);
return status;
@ -1321,7 +1331,7 @@ static bool junction_to_local_path(const struct junction_map *jucn,
return False;
}
status = create_conn_struct(talloc_tos(), conn_out, snum,
lp_pathname(snum), oldpath);
lp_pathname(snum), NULL, oldpath);
if (!NT_STATUS_IS_OK(status)) {
return False;
}
@ -1455,7 +1465,7 @@ static int count_dfs_links(TALLOC_CTX *ctx, int snum)
*/
status = create_conn_struct(talloc_tos(), &conn, snum, connect_path,
&cwd);
NULL, &cwd);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, ("create_conn_struct failed: %s\n",
nt_errstr(status)));
@ -1523,7 +1533,8 @@ static int form_junctions(TALLOC_CTX *ctx,
* Fake up a connection struct for the VFS layer.
*/
status = create_conn_struct(ctx, &conn, snum, connect_path, &cwd);
status = create_conn_struct(ctx, &conn, snum, connect_path, NULL,
&cwd);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, ("create_conn_struct failed: %s\n",
nt_errstr(status)));