diff options
Diffstat (limited to 'source3/rpc_server')
25 files changed, 486 insertions, 486 deletions
diff --git a/source3/rpc_server/dcesrv_gssapi.h b/source3/rpc_server/dcesrv_gssapi.h index 1b7b6bca4c..f770efbf6c 100644 --- a/source3/rpc_server/dcesrv_gssapi.h +++ b/source3/rpc_server/dcesrv_gssapi.h @@ -37,6 +37,6 @@ NTSTATUS gssapi_server_check_flags(struct gse_context *gse_ctx); NTSTATUS gssapi_server_get_user_info(struct gse_context *gse_ctx, TALLOC_CTX *mem_ctx, struct client_address *client_id, - struct auth_serversupplied_info **server_info); + struct auth_serversupplied_info **session_info); #endif /* _DCESRV_GSSAPI_H_ */ diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c index ac13607473..75bb2ed147 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.c +++ b/source3/rpc_server/dcesrv_ntlmssp.c @@ -114,11 +114,11 @@ NTSTATUS ntlmssp_server_check_flags(struct auth_ntlmssp_state *ctx, NTSTATUS ntlmssp_server_get_user_info(struct auth_ntlmssp_state *ctx, TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info **server_info) + struct auth_serversupplied_info **session_info) { NTSTATUS status; - status = auth_ntlmssp_steal_server_info(mem_ctx, ctx, server_info); + status = auth_ntlmssp_steal_session_info(mem_ctx, ctx, session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, (__location__ ": Failed to get authenticated user " "info: %s\n", nt_errstr(status))); diff --git a/source3/rpc_server/dcesrv_ntlmssp.h b/source3/rpc_server/dcesrv_ntlmssp.h index ddb38f69df..a21c512f9e 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.h +++ b/source3/rpc_server/dcesrv_ntlmssp.h @@ -37,6 +37,6 @@ NTSTATUS ntlmssp_server_check_flags(struct auth_ntlmssp_state *ctx, bool do_sign, bool do_seal); NTSTATUS ntlmssp_server_get_user_info(struct auth_ntlmssp_state *ctx, TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info **server_info); + struct auth_serversupplied_info **session_info); #endif /* _DCESRV_NTLMSSP_H_ */ diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c index 17b90505d6..01ecf792b3 100644 --- a/source3/rpc_server/dfs/srv_dfs_nt.c +++ b/source3/rpc_server/dfs/srv_dfs_nt.c @@ -49,7 +49,7 @@ WERROR _dfs_Add(struct pipes_struct *p, struct dfs_Add *r) NTSTATUS status; TALLOC_CTX *ctx = talloc_tos(); - if (p->server_info->utok.uid != sec_initial_uid()) { + if (p->session_info->utok.uid != sec_initial_uid()) { DEBUG(10,("_dfs_add: uid != 0. Access denied.\n")); return WERR_ACCESS_DENIED; } @@ -114,7 +114,7 @@ WERROR _dfs_Remove(struct pipes_struct *p, struct dfs_Remove *r) TALLOC_CTX *ctx = talloc_tos(); char *altpath = NULL; - if (p->server_info->utok.uid != sec_initial_uid()) { + if (p->session_info->utok.uid != sec_initial_uid()) { DEBUG(10,("_dfs_remove: uid != 0. Access denied.\n")); return WERR_ACCESS_DENIED; } diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c index 5bfb176b84..c364890afa 100644 --- a/source3/rpc_server/epmapper/srv_epmapper.c +++ b/source3/rpc_server/epmapper/srv_epmapper.c @@ -227,7 +227,7 @@ error_status_t _epm_Insert(struct pipes_struct *p, uint32_t i; /* If this is not a priviledged users, return */ - if (!is_priviledged_pipe(p->server_info)) { + if (!is_priviledged_pipe(p->session_info)) { return EPMAPPER_STATUS_CANT_PERFORM_OP; } @@ -343,7 +343,7 @@ error_status_t _epm_Delete(struct pipes_struct *p, r->in.num_ents)); /* If this is not a priviledged users, return */ - if (!is_priviledged_pipe(p->server_info)) { + if (!is_priviledged_pipe(p->session_info)) { return EPMAPPER_STATUS_CANT_PERFORM_OP; } diff --git a/source3/rpc_server/eventlog/srv_eventlog_nt.c b/source3/rpc_server/eventlog/srv_eventlog_nt.c index ff8a49526e..f6b508b089 100644 --- a/source3/rpc_server/eventlog/srv_eventlog_nt.c +++ b/source3/rpc_server/eventlog/srv_eventlog_nt.c @@ -236,7 +236,7 @@ static NTSTATUS elog_open( struct pipes_struct * p, const char *logname, struct elog->logname = talloc_strdup( elog, ELOG_APPL ); /* do the access check */ - if ( !elog_check_access( elog, p->server_info->security_token ) ) { + if ( !elog_check_access( elog, p->session_info->security_token ) ) { TALLOC_FREE( elog ); return NT_STATUS_ACCESS_DENIED; } @@ -254,7 +254,7 @@ static NTSTATUS elog_open( struct pipes_struct * p, const char *logname, struct /* now do the access check. Close the tdb if we fail here */ - if ( !elog_check_access( elog, p->server_info->security_token ) ) { + if ( !elog_check_access( elog, p->session_info->security_token ) ) { TALLOC_FREE( elog ); return NT_STATUS_ACCESS_DENIED; } @@ -350,7 +350,7 @@ static bool sync_eventlog_params(TALLOC_CTX *mem_ctx, } status = dcerpc_winreg_int_hklm_openkey(ctx, - get_server_info_system(), + get_session_info_system(), msg_ctx, &h, path, diff --git a/source3/rpc_server/eventlog/srv_eventlog_reg.c b/source3/rpc_server/eventlog/srv_eventlog_reg.c index 8e85abf488..8021c2bfad 100644 --- a/source3/rpc_server/eventlog/srv_eventlog_reg.c +++ b/source3/rpc_server/eventlog/srv_eventlog_reg.c @@ -60,7 +60,7 @@ bool eventlog_init_winreg(struct messaging_context *msg_ctx) key = talloc_strdup(tmp_ctx, TOP_LEVEL_EVENTLOG_KEY); status = dcerpc_winreg_int_hklm_openkey(tmp_ctx, - get_server_info_system(), + get_session_info_system(), msg_ctx, &h, key, diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c index 697b287a0f..70e7ba59aa 100644 --- a/source3/rpc_server/lsa/srv_lsa_nt.c +++ b/source3/rpc_server/lsa/srv_lsa_nt.c @@ -430,8 +430,8 @@ NTSTATUS _lsa_OpenPolicy2(struct pipes_struct *p, NTSTATUS status; /* Work out max allowed. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); /* map the generic bits to the lsa policy ones */ @@ -444,7 +444,7 @@ NTSTATUS _lsa_OpenPolicy2(struct pipes_struct *p, return status; } - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0, des_access, &acc_granted, "_lsa_OpenPolicy2" ); if (!NT_STATUS_IS_OK(status)) { @@ -1503,8 +1503,8 @@ static NTSTATUS _lsa_OpenTrustedDomain_base(struct pipes_struct *p, * handle - so don't check against policy handle. */ /* Work out max allowed. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &access_mask); /* map the generic bits to the lsa account ones */ @@ -1518,7 +1518,7 @@ static NTSTATUS _lsa_OpenTrustedDomain_base(struct pipes_struct *p, return status; } - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0, access_mask, &acc_granted, "_lsa_OpenTrustedDomain"); @@ -1702,14 +1702,14 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(struct pipes_struct *p, return NT_STATUS_ACCESS_DENIED; } - if (p->server_info->utok.uid != sec_initial_uid() && - !nt_token_check_domain_rid(p->server_info->security_token, DOMAIN_RID_ADMINS)) { + if (p->session_info->utok.uid != sec_initial_uid() && + !nt_token_check_domain_rid(p->session_info->security_token, DOMAIN_RID_ADMINS)) { return NT_STATUS_ACCESS_DENIED; } /* Work out max allowed. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &r->in.access_mask); /* map the generic bits to the lsa policy ones */ @@ -1722,7 +1722,7 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(struct pipes_struct *p, return status; } - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0, r->in.access_mask, &acc_granted, "_lsa_CreateTrustedDomainEx2"); @@ -1752,7 +1752,7 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(struct pipes_struct *p, auth_blob.data = r->in.auth_info->auth_blob.data; arcfour_crypt_blob(auth_blob.data, auth_blob.length, - &p->server_info->user_session_key); + &p->session_info->user_session_key); ndr_err = ndr_pull_struct_blob(&auth_blob, p->mem_ctx, &auth_struct, @@ -2398,7 +2398,7 @@ NTSTATUS _lsa_GetUserName(struct pipes_struct *p, return NT_STATUS_INVALID_PARAMETER; } - if (p->server_info->guest) { + if (p->session_info->guest) { /* * I'm 99% sure this is not the right place to do this, * global_sid_Anonymous should probably be put into the token @@ -2409,8 +2409,8 @@ NTSTATUS _lsa_GetUserName(struct pipes_struct *p, return NT_STATUS_NO_MEMORY; } } else { - username = p->server_info->sanitized_username; - domname = p->server_info->info3->base.domain.string; + username = p->session_info->sanitized_username; + domname = p->session_info->info3->base.domain.string; } account_name = TALLOC_P(p->mem_ctx, struct lsa_String); @@ -2463,8 +2463,8 @@ NTSTATUS _lsa_CreateAccount(struct pipes_struct *p, } /* Work out max allowed. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &r->in.access_mask); /* map the generic bits to the lsa policy ones */ @@ -2477,7 +2477,7 @@ NTSTATUS _lsa_CreateAccount(struct pipes_struct *p, return status; } - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0, r->in.access_mask, &acc_granted, "_lsa_CreateAccount"); if (!NT_STATUS_IS_OK(status)) { @@ -2527,8 +2527,8 @@ NTSTATUS _lsa_OpenAccount(struct pipes_struct *p, * handle - so don't check against policy handle. */ /* Work out max allowed. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); /* map the generic bits to the lsa account ones */ @@ -2542,7 +2542,7 @@ NTSTATUS _lsa_OpenAccount(struct pipes_struct *p, return status; } - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0, des_access, &acc_granted, "_lsa_OpenAccount" ); if (!NT_STATUS_IS_OK(status)) { @@ -2897,7 +2897,7 @@ NTSTATUS _lsa_AddAccountRights(struct pipes_struct *p, * on the account sid. We don't check here so just use the latter. JRA. */ - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0, LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|LSA_ACCOUNT_VIEW, &acc_granted, "_lsa_AddAccountRights" ); @@ -2967,7 +2967,7 @@ NTSTATUS _lsa_RemoveAccountRights(struct pipes_struct *p, * and DELETE on the account sid. */ - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0, LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS| LSA_ACCOUNT_VIEW|SEC_STD_DELETE, diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c index f5dace2753..8e766328f5 100644 --- a/source3/rpc_server/netlogon/srv_netlog_nt.c +++ b/source3/rpc_server/netlogon/srv_netlog_nt.c @@ -205,15 +205,15 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p, return WERR_INVALID_PARAM; } - acct_ctrl = p->server_info->info3->base.acct_flags; + acct_ctrl = p->session_info->info3->base.acct_flags; switch (r->in.function_code) { case NETLOGON_CONTROL_TC_VERIFY: case NETLOGON_CONTROL_CHANGE_PASSWORD: case NETLOGON_CONTROL_REDISCOVER: if ((geteuid() != sec_initial_uid()) && - !nt_token_check_domain_rid(p->server_info->security_token, DOMAIN_RID_ADMINS) && - !nt_token_check_sid(&global_sid_Builtin_Administrators, p->server_info->security_token) && + !nt_token_check_domain_rid(p->session_info->security_token, DOMAIN_RID_ADMINS) && + !nt_token_check_sid(&global_sid_Builtin_Administrators, p->session_info->security_token) && !(acct_ctrl & (ACB_WSTRUST | ACB_SVRTRUST))) { return WERR_ACCESS_DENIED; } @@ -415,7 +415,7 @@ NTSTATUS _netr_NetrEnumerateTrustedDomains(struct pipes_struct *p, status = rpcint_binding_handle(p->mem_ctx, &ndr_table_lsarpc, p->client_id, - p->server_info, + p->session_info, p->msg_ctx, &h); if (!NT_STATUS_IS_OK(status)) { @@ -646,7 +646,7 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct, struct dom_sid *domain_sid; uint32_t acct_ctrl; union samr_UserInfo *info; - struct auth_serversupplied_info *server_info; + struct auth_serversupplied_info *session_info; #if 0 /* @@ -672,7 +672,7 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct, goto out; } - status = make_server_info_system(mem_ctx, &server_info); + status = make_session_info_system(mem_ctx, &session_info); if (!NT_STATUS_IS_OK(status)) { goto out; } @@ -685,7 +685,7 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct, status = rpcint_binding_handle(mem_ctx, &ndr_table_samr, &client_id, - server_info, + session_info, msg_ctx, &h); if (!NT_STATUS_IS_OK(status)) { @@ -1087,7 +1087,7 @@ static NTSTATUS netr_creds_server_step_check(struct pipes_struct *p, *************************************************************************/ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *account_name, struct samr_Password *nt_hash) @@ -1110,7 +1110,7 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx, status = rpcint_binding_handle(mem_ctx, &ndr_table_samr, &client_id, - server_info, + session_info, msg_ctx, &h); if (!NT_STATUS_IS_OK(status)) { @@ -1160,7 +1160,7 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx, in = data_blob_const(nt_hash->hash, 16); out = data_blob_talloc_zero(mem_ctx, 16); - sess_crypt_blob(&out, &in, &server_info->user_session_key, true); + sess_crypt_blob(&out, &in, &session_info->user_session_key, true); memcpy(info18.nt_pwd.hash, out.data, out.length); info18.nt_pwd_active = true; @@ -1229,7 +1229,7 @@ NTSTATUS _netr_ServerPasswordSet(struct pipes_struct *p, DEBUG(100,("\n")); status = netr_set_machine_account_password(p->mem_ctx, - p->server_info, + p->session_info, p->msg_ctx, creds->account_name, r->in.new_password); @@ -1276,7 +1276,7 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p, mdfour(nt_hash.hash, plaintext.data, plaintext.length); status = netr_set_machine_account_password(p->mem_ctx, - p->server_info, + p->session_info, p->msg_ctx, creds->account_name, &nt_hash); diff --git a/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c b/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c index ad1ba93746..87b267da26 100644 --- a/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c +++ b/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c @@ -145,7 +145,7 @@ WERROR _PNP_GetDeviceRegProp(struct pipes_struct *p, result = svcctl_lookup_dispname(mem_ctx, p->msg_ctx, - p->server_info, + p->session_info, ptr); if (result == NULL) { return WERR_GENERAL_FAILURE; diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c index 481bb56ee7..223d32b9a8 100644 --- a/source3/rpc_server/rpc_handles.c +++ b/source3/rpc_server/rpc_handles.c @@ -326,7 +326,7 @@ bool pipe_access_check(struct pipes_struct *p) return True; } - if (p->server_info->guest) { + if (p->session_info->guest) { return False; } } diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c index c5c7f617f8..c652c5882a 100644 --- a/source3/rpc_server/rpc_ncacn_np.c +++ b/source3/rpc_server/rpc_ncacn_np.c @@ -118,7 +118,7 @@ int close_internal_rpc_pipe_hnd(struct pipes_struct *p) struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax, struct client_address *client_id, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx) { struct pipes_struct *p; @@ -148,8 +148,8 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx, return NULL; } - p->server_info = copy_serverinfo(p, server_info); - if (p->server_info == NULL) { + p->session_info = copy_serverinfo(p, session_info); + if (p->session_info == NULL) { DEBUG(0, ("open_rpc_pipe_p: copy_serverinfo failed\n")); close_policy_by_pipe(p); TALLOC_FREE(p); @@ -431,7 +431,7 @@ static NTSTATUS rpcint_binding_handle_ex(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *abstract_syntax, const struct ndr_interface_table *ndr_table, struct client_address *client_id, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct dcerpc_binding_handle **binding_handle) { @@ -455,7 +455,7 @@ static NTSTATUS rpcint_binding_handle_ex(TALLOC_CTX *mem_ctx, hs->p = make_internal_rpc_pipe_p(hs, abstract_syntax, client_id, - server_info, + session_info, msg_ctx); if (hs->p == NULL) { TALLOC_FREE(h); @@ -491,7 +491,7 @@ static NTSTATUS rpcint_binding_handle_ex(TALLOC_CTX *mem_ctx, * status = rpcint_binding_handle(tmp_ctx, * &ndr_table_winreg, * p->client_id, - * p->server_info, + * p->session_info, * p->msg_ctx * &winreg_binding); * @endcode @@ -499,12 +499,12 @@ static NTSTATUS rpcint_binding_handle_ex(TALLOC_CTX *mem_ctx, NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx, const struct ndr_interface_table *ndr_table, struct client_address *client_id, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct dcerpc_binding_handle **binding_handle) { return rpcint_binding_handle_ex(mem_ctx, NULL, ndr_table, client_id, - server_info, msg_ctx, binding_handle); + session_info, msg_ctx, binding_handle); } /** @@ -532,7 +532,7 @@ NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx, * status = rpc_pipe_open_internal(tmp_ctx, * &ndr_table_winreg.syntax_id, * rpc_winreg_dispatch, - * p->server_info, + * p->session_info, * &winreg_pipe); * @endcode */ @@ -589,14 +589,14 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, const char *pipe_name, const struct tsocket_address *local_address, const struct tsocket_address *remote_address, - const struct auth_serversupplied_info *server_info) + const struct auth_serversupplied_info *session_info) { struct np_proxy_state *result; char *socket_np_dir; const char *socket_dir; struct tevent_context *ev; struct tevent_req *subreq; - struct auth_session_info_transport *session_info; + struct auth_session_info_transport *session_info_t; struct auth_user_info_dc *user_info_dc; union netr_Validation val; NTSTATUS status; @@ -641,17 +641,17 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, goto fail; } - session_info = talloc_zero(talloc_tos(), struct auth_session_info_transport); - if (session_info == NULL) { + session_info_t = talloc_zero(talloc_tos(), struct auth_session_info_transport); + if (session_info_t == NULL) { DEBUG(0, ("talloc failed\n")); goto fail; } /* Send the named_pipe_auth server the user's full token */ - session_info->security_token = server_info->security_token; - session_info->session_key = server_info->user_session_key; + session_info_t->security_token = session_info->security_token; + session_info_t->session_key = session_info->user_session_key; - val.sam3 = server_info->info3; + val.sam3 = session_info->info3; /* Convert into something we can build a struct * auth_session_info_transport from. Most of the work here @@ -663,7 +663,7 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, goto fail; } - session_info->info = talloc_move(session_info, &user_info_dc->info); + session_info_t->info = talloc_move(session_info_t, &user_info_dc->info); talloc_free(user_info_dc); become_root(); @@ -674,13 +674,13 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, NULL, /* client_name */ local_address, /* server_addr */ NULL, /* server_name */ - session_info); + session_info_t); if (subreq == NULL) { unbecome_root(); DEBUG(0, ("tstream_npa_connect_send to %s for pipe %s and " "user %s\\%s failed\n", - socket_np_dir, pipe_name, session_info->info->domain_name, - session_info->info->account_name)); + socket_np_dir, pipe_name, session_info_t->info->domain_name, + session_info_t->info->account_name)); goto fail; } ok = tevent_req_poll(subreq, ev); @@ -688,8 +688,8 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, if (!ok) { DEBUG(0, ("tevent_req_poll to %s for pipe %s and user %s\\%s " "failed for tstream_npa_connect: %s\n", - socket_np_dir, pipe_name, session_info->info->domain_name, - session_info->info->account_name, + socket_np_dir, pipe_name, session_info_t->info->domain_name, + session_info_t->info->account_name, strerror(errno))); goto fail; @@ -704,8 +704,8 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, if (ret != 0) { DEBUG(0, ("tstream_npa_connect_recv to %s for pipe %s and " "user %s\\%s failed: %s\n", - socket_np_dir, pipe_name, session_info->info->domain_name, - session_info->info->account_name, + socket_np_dir, pipe_name, session_info_t->info->domain_name, + session_info_t->info->account_name, strerror(sys_errno))); goto fail; } @@ -720,7 +720,7 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, static NTSTATUS rpc_pipe_open_external(TALLOC_CTX *mem_ctx, const char *pipe_name, const struct ndr_syntax_id *abstract_syntax, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct rpc_pipe_client **_result) { struct tsocket_address *local, *remote; @@ -743,7 +743,7 @@ static NTSTATUS rpc_pipe_open_external(TALLOC_CTX *mem_ctx, } proxy_state = make_external_rpc_pipe_p(mem_ctx, pipe_name, - local, remote, server_info); + local, remote, session_info); if (!proxy_state) { return NT_STATUS_UNSUCCESSFUL; } @@ -817,7 +817,7 @@ done: * @param mem_ctx The memory context on which thje pipe will ultimately * be allocated * @param name The pipe name to connect to. - * @param server_info Credentials to use for the connection. + * @param session_info Credentials to use for the connection. * @param pipe [in|out] Checks if a pipe is connected, and connects it * if not * @@ -827,7 +827,7 @@ done: NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct client_address *client_id, struct messaging_context *msg_ctx, struct rpc_pipe_client **cli_pipe) @@ -867,7 +867,7 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx, if (StrCaseCmp(server_type, "embedded") == 0) { status = rpc_pipe_open_internal(tmp_ctx, - syntax, server_info, + syntax, session_info, client_id, msg_ctx, &cli); if (!NT_STATUS_IS_OK(status)) { @@ -880,7 +880,7 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx, status = rpc_pipe_open_external(tmp_ctx, pipe_name, syntax, - server_info, + session_info, &cli); if (!NT_STATUS_IS_OK(status)) { goto done; diff --git a/source3/rpc_server/rpc_ncacn_np.h b/source3/rpc_server/rpc_ncacn_np.h index 747e4b6eba..7c8619b46d 100644 --- a/source3/rpc_server/rpc_ncacn_np.h +++ b/source3/rpc_server/rpc_ncacn_np.h @@ -32,17 +32,17 @@ struct np_proxy_state { struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax, struct client_address *client_id, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx); struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, const char *pipe_name, const struct tsocket_address *local_address, const struct tsocket_address *remote_address, - const struct auth_serversupplied_info *server_info); + const struct auth_serversupplied_info *session_info); NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx, const struct ndr_interface_table *ndr_table, struct client_address *client_id, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct dcerpc_binding_handle **binding_handle); NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, @@ -53,7 +53,7 @@ NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, struct rpc_pipe_client **presult); NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct client_address *client_id, struct messaging_context *msg_ctx, struct rpc_pipe_client **cli_pipe); diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c index 1e1e707860..c019d09127 100644 --- a/source3/rpc_server/rpc_server.c +++ b/source3/rpc_server/rpc_server.c @@ -115,7 +115,7 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx, p->endian = RPC_LITTLE_ENDIAN; - /* Fake up an auth_user_info_dc for now, to make an info3, to make the server_info structure */ + /* Fake up an auth_user_info_dc for now, to make an info3, to make the session_info structure */ auth_user_info_dc = talloc_zero(p, struct auth_user_info_dc); if (!auth_user_info_dc) { TALLOC_FREE(p); @@ -142,7 +142,7 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx, status = make_server_info_info3(p, info3->base.account_name.string, info3->base.domain.string, - &p->server_info, info3); + &p->session_info, info3); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to init server info\n")); TALLOC_FREE(p); @@ -154,7 +154,7 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx, * Some internal functions need a local token to determine access to * resoutrces. */ - status = create_local_token(p->server_info); + status = create_local_token(p->session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to init local auth token\n")); TALLOC_FREE(p); @@ -162,14 +162,14 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx, return -1; } - /* Now override the server_info->security_token with the exact + /* Now override the session_info->security_token with the exact * security_token we were given from the other side, * regardless of what we just calculated */ - p->server_info->security_token = talloc_move(p->server_info, &session_info->security_token); + p->session_info->security_token = talloc_move(p->session_info, &session_info->security_token); /* Also set the session key to the correct value */ - p->server_info->user_session_key = session_info->session_key; - p->server_info->user_session_key.data = talloc_move(p->server_info, &session_info->session_key.data); + p->session_info->user_session_key = session_info->session_key; + p->session_info->user_session_key.data = talloc_move(p->session_info, &session_info->session_key.data); p->client_id = talloc_zero(p, struct client_address); if (!p->client_id) { diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c index 7a07643597..b5d5111b20 100644 --- a/source3/rpc_server/samr/srv_samr_nt.c +++ b/source3/rpc_server/samr/srv_samr_nt.c @@ -561,8 +561,8 @@ NTSTATUS _samr_OpenDomain(struct pipes_struct *p, } /*check if access can be granted as requested by client. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); make_samr_object_sd( p->mem_ctx, &psd, &sd_size, &dom_generic_mapping, NULL, 0 ); @@ -572,7 +572,7 @@ NTSTATUS _samr_OpenDomain(struct pipes_struct *p, * Users with SeAddUser get the ability to manipulate groups * and aliases. */ - if (security_token_has_privilege(p->server_info->security_token, SEC_PRIV_ADD_USERS)) { + if (security_token_has_privilege(p->session_info->security_token, SEC_PRIV_ADD_USERS)) { extra_access |= (SAMR_DOMAIN_ACCESS_CREATE_GROUP | SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT | @@ -585,7 +585,7 @@ NTSTATUS _samr_OpenDomain(struct pipes_struct *p, * SAMR_DOMAIN_ACCESS_CREATE_USER access. */ - status = access_check_object( psd, p->server_info->security_token, + status = access_check_object( psd, p->session_info->security_token, SEC_PRIV_MACHINE_ACCOUNT, SEC_PRIV_ADD_USERS, extra_access, des_access, &acc_granted, "_samr_OpenDomain" ); @@ -2296,8 +2296,8 @@ NTSTATUS _samr_OpenUser(struct pipes_struct *p, return NT_STATUS_NO_SUCH_USER; /* check if access can be granted as requested by client. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &usr_generic_mapping, &sid, SAMR_USR_RIGHTS_WRITE_PW); @@ -2345,7 +2345,7 @@ NTSTATUS _samr_OpenUser(struct pipes_struct *p, * DOMAIN_RID_ADMINS. */ if (acb_info & (ACB_SVRTRUST|ACB_DOMTRUST)) { - if (lp_enable_privileges() && nt_token_check_domain_rid(p->server_info->security_token, + if (lp_enable_privileges() && nt_token_check_domain_rid(p->session_info->security_token, DOMAIN_RID_ADMINS)) { des_access &= ~GENERIC_RIGHTS_USER_WRITE; extra_access = GENERIC_RIGHTS_USER_WRITE; @@ -2358,7 +2358,7 @@ NTSTATUS _samr_OpenUser(struct pipes_struct *p, TALLOC_FREE(sampass); - nt_status = access_check_object(psd, p->server_info->security_token, + nt_status = access_check_object(psd, p->session_info->security_token, needed_priv_1, needed_priv_2, GENERIC_RIGHTS_USER_WRITE, des_access, &acc_granted, "_samr_OpenUser"); @@ -2789,7 +2789,7 @@ static NTSTATUS get_user_info_18(struct pipes_struct *p, ZERO_STRUCTP(r); - if (p->server_info->system) { + if (p->session_info->system) { goto query; } @@ -3860,24 +3860,24 @@ NTSTATUS _samr_CreateUser2(struct pipes_struct *p, can_add_account = true; } else if (acb_info & ACB_WSTRUST) { needed_priv = SEC_PRIV_MACHINE_ACCOUNT; - can_add_account = security_token_has_privilege(p->server_info->security_token, SEC_PRIV_MACHINE_ACCOUNT); + can_add_account = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_MACHINE_ACCOUNT); } else if (acb_info & ACB_NORMAL && (account[strlen(account)-1] != '$')) { /* usrmgr.exe (and net rpc trustdom grant) creates a normal user account for domain trusts and changes the ACB flags later */ needed_priv = SEC_PRIV_ADD_USERS; - can_add_account = security_token_has_privilege(p->server_info->security_token, SEC_PRIV_ADD_USERS); + can_add_account = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_ADD_USERS); } else if (lp_enable_privileges()) { /* implicit assumption of a BDC or domain trust account here * (we already check the flags earlier) */ /* only Domain Admins can add a BDC or domain trust */ can_add_account = nt_token_check_domain_rid( - p->server_info->security_token, + p->session_info->security_token, DOMAIN_RID_ADMINS ); } DEBUG(5, ("_samr_CreateUser2: %s can add this account : %s\n", - uidtoname(p->server_info->utok.uid), + uidtoname(p->session_info->utok.uid), can_add_account ? "True":"False" )); if (!can_add_account) { @@ -3902,8 +3902,8 @@ NTSTATUS _samr_CreateUser2(struct pipes_struct *p, sid_compose(&sid, get_global_sam_sid(), *r->out.rid); - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &usr_generic_mapping, @@ -3917,7 +3917,7 @@ NTSTATUS _samr_CreateUser2(struct pipes_struct *p, * just assume we have all the rights we need ? */ - nt_status = access_check_object(psd, p->server_info->security_token, + nt_status = access_check_object(psd, p->session_info->security_token, needed_priv, SEC_PRIV_INVALID, GENERIC_RIGHTS_USER_WRITE, des_access, &acc_granted, "_samr_CreateUser2"); @@ -3985,8 +3985,8 @@ NTSTATUS _samr_Connect(struct pipes_struct *p, was observed from a win98 client trying to enumerate users (when configured user level access control on shares) --jerry */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); se_map_generic( &des_access, &sam_generic_mapping ); @@ -4047,14 +4047,14 @@ NTSTATUS _samr_Connect2(struct pipes_struct *p, return NT_STATUS_ACCESS_DENIED; } - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &sam_generic_mapping, NULL, 0); se_map_generic(&des_access, &sam_generic_mapping); - nt_status = access_check_object(psd, p->server_info->security_token, + nt_status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0, des_access, &acc_granted, fn); @@ -4262,14 +4262,14 @@ NTSTATUS _samr_OpenAlias(struct pipes_struct *p, /*check if access can be granted as requested by client. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &ali_generic_mapping, NULL, 0); se_map_generic(&des_access,&ali_generic_mapping); - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_ADD_USERS, SEC_PRIV_INVALID, GENERIC_RIGHTS_ALIAS_ALL_ACCESS, des_access, &acc_granted, "_samr_OpenAlias"); @@ -5267,7 +5267,7 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, /* Used by AS/U JRA. */ status = set_user_info_18(&info->info18, p->mem_ctx, - &p->server_info->user_session_key, + &p->session_info->user_session_key, pwd); break; @@ -5279,16 +5279,16 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, case 21: status = set_user_info_21(&info->info21, p->mem_ctx, - &p->server_info->user_session_key, + &p->session_info->user_session_key, pwd); break; case 23: - if (!p->server_info->user_session_key.length) { + if (!p->session_info->user_session_key.length) { status = NT_STATUS_NO_USER_SESSION_KEY; } arcfour_crypt_blob(info->info23.password.data, 516, - &p->server_info->user_session_key); + &p->session_info->user_session_key); dump_data(100, info->info23.password.data, 516); @@ -5299,12 +5299,12 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, break; case 24: - if (!p->server_info->user_session_key.length) { + if (!p->session_info->user_session_key.length) { status = NT_STATUS_NO_USER_SESSION_KEY; } arcfour_crypt_blob(info->info24.password.data, 516, - &p->server_info->user_session_key); + &p->session_info->user_session_key); dump_data(100, info->info24.password.data, 516); @@ -5314,12 +5314,12 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, break; case 25: - if (!p->server_info->user_session_key.length) { + if (!p->session_info->user_session_key.length) { status = NT_STATUS_NO_USER_SESSION_KEY; } encode_or_decode_arc4_passwd_buffer( info->info25.password.data, - &p->server_info->user_session_key); + &p->session_info->user_session_key); dump_data(100, info->info25.password.data, 532); @@ -5329,12 +5329,12 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, break; case 26: - if (!p->server_info->user_session_key.length) { + if (!p->session_info->user_session_key.length) { status = NT_STATUS_NO_USER_SESSION_KEY; } encode_or_decode_arc4_passwd_buffer( info->info26.password.data, - &p->server_info->user_session_key); + &p->session_info->user_session_key); dump_data(100, info->info26.password.data, 516); @@ -6336,14 +6336,14 @@ NTSTATUS _samr_OpenGroup(struct pipes_struct *p, } /*check if access can be granted as requested by client. */ - map_max_allowed_access(p->server_info->security_token, - &p->server_info->utok, + map_max_allowed_access(p->session_info->security_token, + &p->session_info->utok, &des_access); make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &grp_generic_mapping, NULL, 0); se_map_generic(&des_access,&grp_generic_mapping); - status = access_check_object(psd, p->server_info->security_token, + status = access_check_object(psd, p->session_info->security_token, SEC_PRIV_ADD_USERS, SEC_PRIV_INVALID, GENERIC_RIGHTS_GROUP_ALL_ACCESS, des_access, &acc_granted, "_samr_OpenGroup"); diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index d2552ae47b..a303a7a321 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -453,7 +453,7 @@ static WERROR delete_printer_handle(struct pipes_struct *p, struct policy_handle done on the handle already */ result = winreg_delete_printer_key(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, Printer->sharename, ""); @@ -462,7 +462,7 @@ static WERROR delete_printer_handle(struct pipes_struct *p, struct policy_handle return WERR_BADFID; } - result = delete_printer_hook(p->mem_ctx, p->server_info->security_token, + result = delete_printer_hook(p->mem_ctx, p->session_info->security_token, Printer->sharename, p->msg_ctx); if (!W_ERROR_IS_OK(result)) { return result; @@ -540,7 +540,7 @@ static void prune_printername_cache(void) ****************************************************************************/ static WERROR set_printer_hnd_name(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct printer_handle *Printer, const char *handlename) @@ -675,7 +675,7 @@ static WERROR set_printer_hnd_name(TALLOC_CTX *mem_ctx, } result = winreg_get_printer(mem_ctx, - server_info, + session_info, msg_ctx, sname, &info2); @@ -761,7 +761,7 @@ static WERROR open_printer_hnd(struct pipes_struct *p, } result = set_printer_hnd_name(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, new_printer, name); if (!W_ERROR_IS_OK(result)) { @@ -1522,7 +1522,7 @@ void do_drv_upgrade_printer(struct messaging_context *msg, DATA_BLOB *data) { TALLOC_CTX *tmp_ctx; - struct auth_serversupplied_info *server_info = NULL; + struct auth_serversupplied_info *session_info = NULL; struct spoolss_PrinterInfo2 *pinfo2; NTSTATUS status; WERROR result; @@ -1533,10 +1533,10 @@ void do_drv_upgrade_printer(struct messaging_context *msg, tmp_ctx = talloc_new(NULL); if (!tmp_ctx) return; - status = make_server_info_system(tmp_ctx, &server_info); + status = make_session_info_system(tmp_ctx, &session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("do_drv_upgrade_printer: " - "Could not create system server_info\n")); + "Could not create system session_info\n")); goto done; } @@ -1561,7 +1561,7 @@ void do_drv_upgrade_printer(struct messaging_context *msg, continue; } - result = winreg_get_printer(tmp_ctx, server_info, msg, + result = winreg_get_printer(tmp_ctx, session_info, msg, lp_const_servicename(snum), &pinfo2); @@ -1581,7 +1581,7 @@ void do_drv_upgrade_printer(struct messaging_context *msg, /* all we care about currently is the change_id */ result = winreg_printer_update_changeid(tmp_ctx, - server_info, + session_info, msg, pinfo2->printername); @@ -1801,14 +1801,14 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p, /* if the user is not root, doesn't have SE_PRINT_OPERATOR privilege, and not a printer admin, then fail */ - if ((p->server_info->utok.uid != sec_initial_uid()) && - !security_token_has_privilege(p->server_info->security_token, SEC_PRIV_PRINT_OPERATOR) && - !nt_token_check_sid(&global_sid_Builtin_Print_Operators, p->server_info->security_token) && + if ((p->session_info->utok.uid != sec_initial_uid()) && + !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_PRINT_OPERATOR) && + !nt_token_check_sid(&global_sid_Builtin_Print_Operators, p->session_info->security_token) && !token_contains_name_in_list( - uidtoname(p->server_info->utok.uid), - p->server_info->info3->base.domain.string, + uidtoname(p->session_info->utok.uid), + p->session_info->info3->base.domain.string, NULL, - p->server_info->security_token, + p->session_info->security_token, lp_printer_admin(snum))) { close_printer_handle(p, r->out.handle); ZERO_STRUCTP(r->out.handle); @@ -1873,9 +1873,9 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p, return WERR_ACCESS_DENIED; } - if (!user_ok_token(uidtoname(p->server_info->utok.uid), NULL, - p->server_info->security_token, snum) || - !print_access_check(p->server_info, + if (!user_ok_token(uidtoname(p->session_info->utok.uid), NULL, + p->session_info->security_token, snum) || + !print_access_check(p->session_info, p->msg_ctx, snum, r->in.access_mask)) { @@ -1901,7 +1901,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p, ? "PRINTER_ACCESS_ADMINISTER" : "PRINTER_ACCESS_USE" )); winreg_create_printer(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); @@ -1992,7 +1992,7 @@ WERROR _spoolss_DeletePrinter(struct pipes_struct *p, if (get_printer_snum(p, r->in.handle, &snum, NULL)) { winreg_delete_printer_key(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), ""); @@ -2049,13 +2049,13 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, /* if the user is not root, doesn't have SE_PRINT_OPERATOR privilege, and not a printer admin, then fail */ - if ( (p->server_info->utok.uid != sec_initial_uid()) - && !security_token_has_privilege(p->server_info->security_token, SEC_PRIV_PRINT_OPERATOR) + if ( (p->session_info->utok.uid != sec_initial_uid()) + && !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_PRINT_OPERATOR) && !token_contains_name_in_list( - uidtoname(p->server_info->utok.uid), - p->server_info->info3->base.domain.string, + uidtoname(p->session_info->utok.uid), + p->session_info->info3->base.domain.string, NULL, - p->server_info->security_token, + p->session_info->security_token, lp_printer_admin(-1)) ) { return WERR_ACCESS_DENIED; @@ -2067,7 +2067,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, return WERR_INVALID_ENVIRONMENT; status = winreg_get_driver(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.architecture, r->in.driver, version, &info); @@ -2078,7 +2078,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, version = 3; status = winreg_get_driver(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.architecture, r->in.driver, @@ -2097,7 +2097,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, } if (printer_driver_in_use(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info)) { status = WERR_PRINTER_DRIVER_IN_USE; @@ -2106,7 +2106,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, if (version == 2) { status = winreg_get_driver(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.architecture, r->in.driver, 3, &info_win2k); @@ -2115,7 +2115,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, /* remove the Win2k driver first*/ status = winreg_del_driver(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info_win2k, 3); talloc_free(info_win2k); @@ -2128,7 +2128,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, } status = winreg_del_driver(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info, version); @@ -2154,13 +2154,13 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, /* if the user is not root, doesn't have SE_PRINT_OPERATOR privilege, and not a printer admin, then fail */ - if ( (p->server_info->utok.uid != sec_initial_uid()) - && !security_token_has_privilege(p->server_info->security_token, SEC_PRIV_PRINT_OPERATOR) + if ( (p->session_info->utok.uid != sec_initial_uid()) + && !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_PRINT_OPERATOR) && !token_contains_name_in_list( - uidtoname(p->server_info->utok.uid), - p->server_info->info3->base.domain.string, + uidtoname(p->session_info->utok.uid), + p->session_info->info3->base.domain.string, NULL, - p->server_info->security_token, lp_printer_admin(-1)) ) + p->session_info->security_token, lp_printer_admin(-1)) ) { return WERR_ACCESS_DENIED; } @@ -2175,7 +2175,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, version = r->in.version; status = winreg_get_driver(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.architecture, r->in.driver, @@ -2197,7 +2197,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, version = 3; status = winreg_get_driver(info, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.architecture, r->in.driver, @@ -2209,7 +2209,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, } if (printer_driver_in_use(info, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info)) { status = WERR_PRINTER_DRIVER_IN_USE; @@ -2235,7 +2235,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, if (delete_files && (r->in.delete_flags & DPD_DELETE_ALL_FILES) && printer_driver_files_in_use(info, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info)) { /* no idea of the correct error here */ @@ -2248,7 +2248,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, if ( (version == 2) && ((r->in.delete_flags & DPD_DELETE_SPECIFIC_VERSION) != DPD_DELETE_SPECIFIC_VERSION) ) { status = winreg_get_driver(info, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.architecture, r->in.driver, 3, &info_win2k); @@ -2257,7 +2257,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, if (delete_files && (r->in.delete_flags & DPD_DELETE_ALL_FILES) && printer_driver_files_in_use(info, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info_win2k)) { /* no idea of the correct error here */ @@ -2270,7 +2270,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, /* remove the Win2k driver first*/ status = winreg_del_driver(info, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info_win2k, 3); @@ -2287,14 +2287,14 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, * because the driver doesn not exist any more */ if (delete_files) { - delete_driver_files(get_server_info_system(), + delete_driver_files(get_session_info_system(), info_win2k); } } } status = winreg_del_driver(info, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info, version); @@ -2308,7 +2308,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, * because the driver doesn not exist any more */ if (delete_files) { - delete_driver_files(get_server_info_system(), info); + delete_driver_files(get_session_info_system(), info); } done: @@ -3560,9 +3560,9 @@ static WERROR printserver_notify_info(struct pipes_struct *p, continue; /* skip */ } - /* Maybe we should use the SYSTEM server_info here... */ + /* Maybe we should use the SYSTEM session_info here... */ result = winreg_get_printer(mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_servicename(snum), &pinfo2); @@ -3646,9 +3646,9 @@ static WERROR printer_notify_info(struct pipes_struct *p, get_printer_snum(p, hnd, &snum, NULL); - /* Maybe we should use the SYSTEM server_info here... */ + /* Maybe we should use the SYSTEM session_info here... */ result = winreg_get_printer(mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_servicename(snum), &pinfo2); if (!W_ERROR_IS_OK(result)) { @@ -3823,7 +3823,7 @@ static void compose_devicemode_devicename(struct spoolss_DeviceMode *dm, ********************************************************************/ static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct spoolss_PrinterInfo2 *info2, const char *servername, @@ -3896,7 +3896,7 @@ static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx, r->high_part_total_bytes = 0x0; /* ChangeID in milliseconds*/ - winreg_printer_get_changeid(mem_ctx, server_info, msg_ctx, + winreg_printer_get_changeid(mem_ctx, session_info, msg_ctx, info2->sharename, &r->change_id); r->last_error = WERR_OK; @@ -4151,18 +4151,18 @@ static WERROR construct_printer_info7(TALLOC_CTX *mem_ctx, struct spoolss_PrinterInfo7 *r, int snum) { - struct auth_serversupplied_info *server_info; + struct auth_serversupplied_info *session_info; struct GUID guid; NTSTATUS status; - status = make_server_info_system(mem_ctx, &server_info); + status = make_session_info_system(mem_ctx, &session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("construct_printer_info7: " - "Could not create system server_info\n")); + "Could not create system session_info\n")); return WERR_NOMEM; } - if (is_printer_published(mem_ctx, server_info, msg_ctx, + if (is_printer_published(mem_ctx, session_info, msg_ctx, servername, lp_servicename(snum), &guid, NULL)) { r->guid = talloc_strdup_upper(mem_ctx, GUID_string2(mem_ctx, &guid)); @@ -4173,7 +4173,7 @@ static WERROR construct_printer_info7(TALLOC_CTX *mem_ctx, } W_ERROR_HAVE_NO_MEMORY(r->guid); - TALLOC_FREE(server_info); + TALLOC_FREE(session_info); return WERR_OK; } @@ -4220,7 +4220,7 @@ static bool snum_is_shared_printer(int snum) ********************************************************************/ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *servername, uint32_t level, @@ -4252,7 +4252,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, printer, snum)); result = winreg_create_printer(mem_ctx, - server_info, + session_info, msg_ctx, printer); if (!W_ERROR_IS_OK(result)) { @@ -4267,7 +4267,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, goto out; } - result = winreg_get_printer(mem_ctx, server_info, msg_ctx, + result = winreg_get_printer(mem_ctx, session_info, msg_ctx, printer, &info2); if (!W_ERROR_IS_OK(result)) { goto out; @@ -4275,7 +4275,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, switch (level) { case 0: - result = construct_printer_info0(info, server_info, + result = construct_printer_info0(info, session_info, msg_ctx, info2, servername, &info[count].info0, snum); @@ -4332,7 +4332,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level0(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -4341,7 +4341,7 @@ static WERROR enumprinters_level0(TALLOC_CTX *mem_ctx, { DEBUG(4,("enum_all_printers_info_0\n")); - return enum_all_printers_info_level(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_level(mem_ctx, session_info, msg_ctx, servername, 0, flags, info, count); } @@ -4350,7 +4350,7 @@ static WERROR enumprinters_level0(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enum_all_printers_info_1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *servername, uint32_t flags, @@ -4359,7 +4359,7 @@ static WERROR enum_all_printers_info_1(TALLOC_CTX *mem_ctx, { DEBUG(4,("enum_all_printers_info_1\n")); - return enum_all_printers_info_level(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_level(mem_ctx, session_info, msg_ctx, servername, 1, flags, info, count); } @@ -4368,7 +4368,7 @@ static WERROR enum_all_printers_info_1(TALLOC_CTX *mem_ctx, *********************************************************************/ static WERROR enum_all_printers_info_1_local(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *servername, union spoolss_PrinterInfo **info, @@ -4376,7 +4376,7 @@ static WERROR enum_all_printers_info_1_local(TALLOC_CTX *mem_ctx, { DEBUG(4,("enum_all_printers_info_1_local\n")); - return enum_all_printers_info_1(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_1(mem_ctx, session_info, msg_ctx, servername, PRINTER_ENUM_ICON8, info, count); } @@ -4385,7 +4385,7 @@ static WERROR enum_all_printers_info_1_local(TALLOC_CTX *mem_ctx, *********************************************************************/ static WERROR enum_all_printers_info_1_name(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *servername, union spoolss_PrinterInfo **info, @@ -4403,7 +4403,7 @@ static WERROR enum_all_printers_info_1_name(TALLOC_CTX *mem_ctx, return WERR_INVALID_NAME; } - return enum_all_printers_info_1(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_1(mem_ctx, session_info, msg_ctx, servername, PRINTER_ENUM_ICON8, info, count); } @@ -4412,7 +4412,7 @@ static WERROR enum_all_printers_info_1_name(TALLOC_CTX *mem_ctx, *********************************************************************/ static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *servername, union spoolss_PrinterInfo **info, @@ -4438,7 +4438,7 @@ static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx, return WERR_CAN_NOT_COMPLETE; } - return enum_all_printers_info_1(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_1(mem_ctx, session_info, msg_ctx, servername, PRINTER_ENUM_NAME, info, count); } @@ -4449,7 +4449,7 @@ static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *servername, union spoolss_PrinterInfo **info, @@ -4457,7 +4457,7 @@ static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx, { DEBUG(4,("enum_all_printers_info_2\n")); - return enum_all_printers_info_level(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_level(mem_ctx, session_info, msg_ctx, servername, 2, 0, info, count); } @@ -4466,7 +4466,7 @@ static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -4476,18 +4476,18 @@ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx, /* Not all the flags are equals */ if (flags & PRINTER_ENUM_LOCAL) { - return enum_all_printers_info_1_local(mem_ctx, server_info, + return enum_all_printers_info_1_local(mem_ctx, session_info, msg_ctx, servername, info, count); } if (flags & PRINTER_ENUM_NAME) { - return enum_all_printers_info_1_name(mem_ctx, server_info, + return enum_all_printers_info_1_name(mem_ctx, session_info, msg_ctx, servername, info, count); } if (flags & PRINTER_ENUM_NETWORK) { - return enum_all_printers_info_1_network(mem_ctx, server_info, + return enum_all_printers_info_1_network(mem_ctx, session_info, msg_ctx, servername, info, count); } @@ -4500,7 +4500,7 @@ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -4509,7 +4509,7 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx, { if (flags & PRINTER_ENUM_LOCAL) { - return enum_all_printers_info_2(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_2(mem_ctx, session_info, msg_ctx, servername, info, count); } @@ -4519,7 +4519,7 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx, return WERR_INVALID_NAME; } - return enum_all_printers_info_2(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_2(mem_ctx, session_info, msg_ctx, servername, info, count); } @@ -4536,7 +4536,7 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level4(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -4545,7 +4545,7 @@ static WERROR enumprinters_level4(TALLOC_CTX *mem_ctx, { DEBUG(4,("enum_all_printers_info_4\n")); - return enum_all_printers_info_level(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_level(mem_ctx, session_info, msg_ctx, servername, 4, flags, info, count); } @@ -4555,7 +4555,7 @@ static WERROR enumprinters_level4(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level5(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -4564,7 +4564,7 @@ static WERROR enumprinters_level5(TALLOC_CTX *mem_ctx, { DEBUG(4,("enum_all_printers_info_5\n")); - return enum_all_printers_info_level(mem_ctx, server_info, msg_ctx, + return enum_all_printers_info_level(mem_ctx, session_info, msg_ctx, servername, 5, flags, info, count); } @@ -4575,7 +4575,7 @@ static WERROR enumprinters_level5(TALLOC_CTX *mem_ctx, WERROR _spoolss_EnumPrinters(struct pipes_struct *p, struct spoolss_EnumPrinters *r) { - const struct auth_serversupplied_info *server_info = get_server_info_system(); + const struct auth_serversupplied_info *session_info = get_session_info_system(); WERROR result; /* that's an [in out] buffer */ @@ -4609,31 +4609,31 @@ WERROR _spoolss_EnumPrinters(struct pipes_struct *p, switch (r->in.level) { case 0: - result = enumprinters_level0(p->mem_ctx, server_info, + result = enumprinters_level0(p->mem_ctx, session_info, p->msg_ctx, r->in.flags, r->in.server, r->out.info, r->out.count); break; case 1: - result = enumprinters_level1(p->mem_ctx, server_info, + result = enumprinters_level1(p->mem_ctx, session_info, p->msg_ctx, r->in.flags, r->in.server, r->out.info, r->out.count); break; case 2: - result = enumprinters_level2(p->mem_ctx, server_info, + result = enumprinters_level2(p->mem_ctx, session_info, p->msg_ctx, r->in.flags, r->in.server, r->out.info, r->out.count); break; case 4: - result = enumprinters_level4(p->mem_ctx, server_info, + result = enumprinters_level4(p->mem_ctx, session_info, p->msg_ctx, r->in.flags, r->in.server, r->out.info, r->out.count); break; case 5: - result = enumprinters_level5(p->mem_ctx, server_info, + result = enumprinters_level5(p->mem_ctx, session_info, p->msg_ctx, r->in.flags, r->in.server, r->out.info, r->out.count); @@ -4685,7 +4685,7 @@ WERROR _spoolss_GetPrinter(struct pipes_struct *p, } result = winreg_get_printer(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), &info2); @@ -4696,7 +4696,7 @@ WERROR _spoolss_GetPrinter(struct pipes_struct *p, switch (r->in.level) { case 0: result = construct_printer_info0(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info2, Printer->servername, @@ -5445,7 +5445,7 @@ static WERROR fill_printer_driver_info101(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, uint32_t level, union spoolss_DriverInfo *r, @@ -5463,7 +5463,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx, } result = winreg_get_printer(mem_ctx, - server_info, + session_info, msg_ctx, lp_const_servicename(snum), &pinfo2); @@ -5475,7 +5475,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx, return WERR_INVALID_PRINTER_NAME; } - result = winreg_get_driver(mem_ctx, server_info, msg_ctx, + result = winreg_get_driver(mem_ctx, session_info, msg_ctx, architecture, pinfo2->drivername, version, &driver); @@ -5494,7 +5494,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx, /* Yes - try again with a WinNT driver. */ version = 2; - result = winreg_get_driver(mem_ctx, server_info, msg_ctx, + result = winreg_get_driver(mem_ctx, session_info, msg_ctx, architecture, pinfo2->drivername, version, &driver); @@ -5578,7 +5578,7 @@ WERROR _spoolss_GetPrinterDriver2(struct pipes_struct *p, } result = construct_printer_driver_info_level(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.level, r->out.info, snum, printer->servername, @@ -5694,7 +5694,7 @@ WERROR _spoolss_StartDocPrinter(struct pipes_struct *p, return WERR_BADFID; } - werr = print_job_start(p->server_info, + werr = print_job_start(p->session_info, p->msg_ctx, p->client_id->name, snum, @@ -5797,7 +5797,7 @@ WERROR _spoolss_WritePrinter(struct pipes_struct *p, static WERROR control_printer(struct policy_handle *handle, uint32_t command, struct pipes_struct *p) { - const struct auth_serversupplied_info *server_info = p->server_info; + const struct auth_serversupplied_info *session_info = p->session_info; int snum; WERROR errcode = WERR_BADFUNC; struct printer_handle *Printer = find_printer_index_by_hnd(p, handle); @@ -5813,14 +5813,14 @@ static WERROR control_printer(struct policy_handle *handle, uint32_t command, switch (command) { case SPOOLSS_PRINTER_CONTROL_PAUSE: - errcode = print_queue_pause(server_info, p->msg_ctx, snum); + errcode = print_queue_pause(session_info, p->msg_ctx, snum); break; case SPOOLSS_PRINTER_CONTROL_RESUME: case SPOOLSS_PRINTER_CONTROL_UNPAUSE: - errcode = print_queue_resume(server_info, p->msg_ctx, snum); + errcode = print_queue_resume(session_info, p->msg_ctx, snum); break; case SPOOLSS_PRINTER_CONTROL_PURGE: - errcode = print_queue_purge(server_info, p->msg_ctx, snum); + errcode = print_queue_purge(session_info, p->msg_ctx, snum); break; default: return WERR_UNKNOWN_LEVEL; @@ -5856,7 +5856,7 @@ WERROR _spoolss_AbortPrinter(struct pipes_struct *p, return WERR_SPL_NO_STARTDOC; } - errcode = print_job_delete(p->server_info, + errcode = print_job_delete(p->session_info, p->msg_ctx, snum, Printer->jobid); @@ -5910,7 +5910,7 @@ static WERROR update_printer_sec(struct policy_handle *handle, /* NT seems to like setting the security descriptor even though nothing may have actually changed. */ result = winreg_get_printer_secdesc(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer, &old_secdesc); @@ -5962,7 +5962,7 @@ static WERROR update_printer_sec(struct policy_handle *handle, } result = winreg_set_printer_secdesc(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer, new_secdesc); @@ -6156,7 +6156,7 @@ static bool add_printer_hook(TALLOC_CTX *ctx, struct security_token *token, } static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, int snum, struct spoolss_SetPrinterInfo2 *printer, @@ -6173,7 +6173,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->drivername, old_printer->drivername)) { push_reg_sz(mem_ctx, &buffer, printer->drivername); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6195,7 +6195,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->comment, old_printer->comment)) { push_reg_sz(mem_ctx, &buffer, printer->comment); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6214,7 +6214,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->sharename, old_printer->sharename)) { push_reg_sz(mem_ctx, &buffer, printer->sharename); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6243,7 +6243,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, push_reg_sz(mem_ctx, &buffer, p); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6261,7 +6261,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->portname, old_printer->portname)) { push_reg_sz(mem_ctx, &buffer, printer->portname); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6280,7 +6280,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->location, old_printer->location)) { push_reg_sz(mem_ctx, &buffer, printer->location); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6300,7 +6300,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->sepfile, old_printer->sepfile)) { push_reg_sz(mem_ctx, &buffer, printer->sepfile); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6321,7 +6321,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, buffer = data_blob_talloc(mem_ctx, NULL, 4); SIVAL(buffer.data, 0, printer->starttime); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6335,7 +6335,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, buffer = data_blob_talloc(mem_ctx, NULL, 4); SIVAL(buffer.data, 0, printer->untiltime); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6349,7 +6349,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, buffer = data_blob_talloc(mem_ctx, NULL, 4); SIVAL(buffer.data, 0, printer->priority); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6364,7 +6364,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, SIVAL(buffer.data, 0, (printer->attributes & PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS)); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6388,7 +6388,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } push_reg_sz(mem_ctx, &buffer, spooling); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6400,7 +6400,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, push_reg_sz(mem_ctx, &buffer, global_myname()); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6422,7 +6422,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, push_reg_sz(mem_ctx, &buffer, longname); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6435,7 +6435,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, global_myname(), printer->sharename); push_reg_sz(mem_ctx, &buffer, uncname); winreg_set_printer_dataex(mem_ctx, - server_info, + session_info, msg_ctx, printer->sharename, SPOOL_DSSPOOLER_KEY, @@ -6484,7 +6484,7 @@ static WERROR update_printer(struct pipes_struct *p, } result = winreg_get_printer(tmp_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), &old_printer); @@ -6519,7 +6519,7 @@ static WERROR update_printer(struct pipes_struct *p, !strequal(printer->location, old_printer->location)) ) { /* add_printer_hook() will call reload_services() */ - if (!add_printer_hook(tmp_ctx, p->server_info->security_token, + if (!add_printer_hook(tmp_ctx, p->session_info->security_token, printer, p->client_id->addr, p->msg_ctx)) { result = WERR_ACCESS_DENIED; @@ -6528,7 +6528,7 @@ static WERROR update_printer(struct pipes_struct *p, } update_dsspooler(tmp_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, snum, printer, @@ -6540,7 +6540,7 @@ static WERROR update_printer(struct pipes_struct *p, printer_mask &= ~SPOOLSS_PRINTER_INFO_DEVMODE; } result = winreg_update_printer(tmp_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer->sharename, printer_mask, @@ -6581,7 +6581,7 @@ static WERROR publish_or_unpublish_printer(struct pipes_struct *p, return WERR_BADFID; result = winreg_get_printer(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_servicename(snum), &pinfo2); @@ -6590,7 +6590,7 @@ static WERROR publish_or_unpublish_printer(struct pipes_struct *p, } nt_printer_publish(pinfo2, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, pinfo2, info7->action); @@ -6630,7 +6630,7 @@ static WERROR update_printer_devmode(struct pipes_struct *p, } return winreg_update_printer(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), info2_mask, @@ -7044,7 +7044,7 @@ WERROR _spoolss_EnumJobs(struct pipes_struct *p, } result = winreg_get_printer(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), &pinfo2); @@ -7141,7 +7141,7 @@ static WERROR spoolss_setjob_1(TALLOC_CTX *mem_ctx, WERROR _spoolss_SetJob(struct pipes_struct *p, struct spoolss_SetJob *r) { - const struct auth_serversupplied_info *server_info = p->server_info; + const struct auth_serversupplied_info *session_info = p->session_info; int snum; WERROR errcode = WERR_BADFUNC; @@ -7156,21 +7156,21 @@ WERROR _spoolss_SetJob(struct pipes_struct *p, switch (r->in.command) { case SPOOLSS_JOB_CONTROL_CANCEL: case SPOOLSS_JOB_CONTROL_DELETE: - errcode = print_job_delete(server_info, p->msg_ctx, + errcode = print_job_delete(session_info, p->msg_ctx, snum, r->in.job_id); if (W_ERROR_EQUAL(errcode, WERR_PRINTER_HAS_JOBS_QUEUED)) { errcode = WERR_OK; } break; case SPOOLSS_JOB_CONTROL_PAUSE: - if (print_job_pause(server_info, p->msg_ctx, + if (print_job_pause(session_info, p->msg_ctx, snum, r->in.job_id, &errcode)) { errcode = WERR_OK; } break; case SPOOLSS_JOB_CONTROL_RESTART: case SPOOLSS_JOB_CONTROL_RESUME: - if (print_job_resume(server_info, p->msg_ctx, + if (print_job_resume(session_info, p->msg_ctx, snum, r->in.job_id, &errcode)) { errcode = WERR_OK; } @@ -7212,7 +7212,7 @@ WERROR _spoolss_SetJob(struct pipes_struct *p, ****************************************************************************/ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *servername, const char *architecture, @@ -7233,7 +7233,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx, *info_p = NULL; for (version=0; version<DRIVER_MAX_VERSION; version++) { - result = winreg_get_driver_list(mem_ctx, server_info, msg_ctx, + result = winreg_get_driver_list(mem_ctx, session_info, msg_ctx, architecture, version, &num_drivers, &drivers); if (!W_ERROR_IS_OK(result)) { @@ -7258,7 +7258,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx, for (i = 0; i < num_drivers; i++) { DEBUG(5, ("\tdriver: [%s]\n", drivers[i])); - result = winreg_get_driver(mem_ctx, server_info, + result = winreg_get_driver(mem_ctx, session_info, msg_ctx, architecture, drivers[i], version, &driver); @@ -7330,7 +7330,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx, ****************************************************************************/ static WERROR enumprinterdrivers_level(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *servername, const char *architecture, @@ -7349,7 +7349,7 @@ static WERROR enumprinterdrivers_level(TALLOC_CTX *mem_ctx, uint32_t count = 0; result = enumprinterdrivers_level_by_architecture(mem_ctx, - server_info, + session_info, msg_ctx, servername, archi_table[a].long_archi, @@ -7370,7 +7370,7 @@ static WERROR enumprinterdrivers_level(TALLOC_CTX *mem_ctx, } return enumprinterdrivers_level_by_architecture(mem_ctx, - server_info, + session_info, msg_ctx, servername, architecture, @@ -7408,7 +7408,7 @@ WERROR _spoolss_EnumPrinterDrivers(struct pipes_struct *p, } result = enumprinterdrivers_level(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, cservername, r->in.environment, @@ -7455,7 +7455,7 @@ WERROR _spoolss_EnumForms(struct pipes_struct *p, switch (r->in.level) { case 1: result = winreg_printer_enumforms1(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->out.count, r->out.info); @@ -7505,7 +7505,7 @@ WERROR _spoolss_GetForm(struct pipes_struct *p, switch (r->in.level) { case 1: result = winreg_printer_getform1(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.form_name, &r->out.info->info1); @@ -7836,7 +7836,7 @@ static WERROR spoolss_addprinterex_level_2(struct pipes_struct *p, trying to add a printer like this --jerry */ if (*lp_addprinter_cmd() ) { - if ( !add_printer_hook(p->mem_ctx, p->server_info->security_token, + if ( !add_printer_hook(p->mem_ctx, p->session_info->security_token, info2, p->client_id->addr, p->msg_ctx) ) { return WERR_ACCESS_DENIED; @@ -7853,7 +7853,7 @@ static WERROR spoolss_addprinterex_level_2(struct pipes_struct *p, } /* you must be a printer admin to add a new printer */ - if (!print_access_check(p->server_info, + if (!print_access_check(p->session_info, p->msg_ctx, snum, PRINTER_ACCESS_ADMINISTER)) { @@ -7873,14 +7873,14 @@ static WERROR spoolss_addprinterex_level_2(struct pipes_struct *p, } update_dsspooler(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, 0, info2, NULL); err = winreg_update_printer(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, info2->sharename, info2_mask, @@ -8007,7 +8007,7 @@ WERROR _spoolss_AddPrinterDriverEx(struct pipes_struct *p, } err = winreg_add_driver(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, r->in.info_ctr, &driver_name, @@ -8427,12 +8427,12 @@ WERROR _spoolss_AddForm(struct pipes_struct *p, /* if the user is not root, doesn't have SE_PRINT_OPERATOR privilege, and not a printer admin, then fail */ - if ((p->server_info->utok.uid != sec_initial_uid()) && - !security_token_has_privilege(p->server_info->security_token, SEC_PRIV_PRINT_OPERATOR) && - !token_contains_name_in_list(uidtoname(p->server_info->utok.uid), - p->server_info->info3->base.domain.string, + if ((p->session_info->utok.uid != sec_initial_uid()) && + !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_PRINT_OPERATOR) && + !token_contains_name_in_list(uidtoname(p->session_info->utok.uid), + p->session_info->info3->base.domain.string, NULL, - p->server_info->security_token, + p->session_info->security_token, lp_printer_admin(snum))) { DEBUG(2,("_spoolss_Addform: denied by insufficient permissions.\n")); return WERR_ACCESS_DENIED; @@ -8448,7 +8448,7 @@ WERROR _spoolss_AddForm(struct pipes_struct *p, } status = winreg_printer_addform1(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, form); if (!W_ERROR_IS_OK(status)) { @@ -8464,7 +8464,7 @@ WERROR _spoolss_AddForm(struct pipes_struct *p, } status = winreg_printer_update_changeid(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); if (!W_ERROR_IS_OK(status)) { @@ -8495,19 +8495,19 @@ WERROR _spoolss_DeleteForm(struct pipes_struct *p, return WERR_BADFID; } - if ((p->server_info->utok.uid != sec_initial_uid()) && - !security_token_has_privilege(p->server_info->security_token, SEC_PRIV_PRINT_OPERATOR) && - !token_contains_name_in_list(uidtoname(p->server_info->utok.uid), - p->server_info->info3->base.domain.string, + if ((p->session_info->utok.uid != sec_initial_uid()) && + !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_PRINT_OPERATOR) && + !token_contains_name_in_list(uidtoname(p->session_info->utok.uid), + p->session_info->info3->base.domain.string, NULL, - p->server_info->security_token, + p->session_info->security_token, lp_printer_admin(snum))) { DEBUG(2,("_spoolss_DeleteForm: denied by insufficient permissions.\n")); return WERR_ACCESS_DENIED; } status = winreg_printer_deleteform1(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, form_name); if (!W_ERROR_IS_OK(status)) { @@ -8523,7 +8523,7 @@ WERROR _spoolss_DeleteForm(struct pipes_struct *p, } status = winreg_printer_update_changeid(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); if (!W_ERROR_IS_OK(status)) { @@ -8559,19 +8559,19 @@ WERROR _spoolss_SetForm(struct pipes_struct *p, /* if the user is not root, doesn't have SE_PRINT_OPERATOR privilege, and not a printer admin, then fail */ - if ((p->server_info->utok.uid != sec_initial_uid()) && - !security_token_has_privilege(p->server_info->security_token, SEC_PRIV_PRINT_OPERATOR) && - !token_contains_name_in_list(uidtoname(p->server_info->utok.uid), - p->server_info->info3->base.domain.string, + if ((p->session_info->utok.uid != sec_initial_uid()) && + !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_PRINT_OPERATOR) && + !token_contains_name_in_list(uidtoname(p->session_info->utok.uid), + p->session_info->info3->base.domain.string, NULL, - p->server_info->security_token, + p->session_info->security_token, lp_printer_admin(snum))) { DEBUG(2,("_spoolss_Setform: denied by insufficient permissions.\n")); return WERR_ACCESS_DENIED; } status = winreg_printer_setform1(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, form_name, form); @@ -8588,7 +8588,7 @@ WERROR _spoolss_SetForm(struct pipes_struct *p, } status = winreg_printer_update_changeid(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); if (!W_ERROR_IS_OK(status)) { @@ -9082,7 +9082,7 @@ WERROR _spoolss_GetJob(struct pipes_struct *p, } result = winreg_get_printer(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), &pinfo2); @@ -9209,7 +9209,7 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p, uint32_t changeid = 0; result = winreg_printer_get_changeid(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer, &changeid); @@ -9224,7 +9224,7 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p, } result = winreg_get_printer_dataex(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer, r->in.key_name, @@ -9299,7 +9299,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p, } result = winreg_get_printer(Printer, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_servicename(snum), &pinfo2); @@ -9318,7 +9318,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p, /* save the registry data */ result = winreg_set_printer_dataex(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, pinfo2->sharename, r->in.key_name, @@ -9344,7 +9344,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p, * this is right. --jerry */ winreg_set_printer_dataex(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, pinfo2->sharename, str, @@ -9355,7 +9355,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p, } result = winreg_printer_update_changeid(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); @@ -9403,14 +9403,14 @@ WERROR _spoolss_DeletePrinterDataEx(struct pipes_struct *p, printer = lp_const_servicename(snum); status = winreg_delete_printer_dataex(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer, r->in.key_name, r->in.value_name); if (W_ERROR_IS_OK(status)) { status = winreg_printer_update_changeid(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer); } @@ -9445,7 +9445,7 @@ WERROR _spoolss_EnumPrinterKey(struct pipes_struct *p, } result = winreg_enum_printer_key(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), r->in.key_name, @@ -9519,13 +9519,13 @@ WERROR _spoolss_DeletePrinterKey(struct pipes_struct *p, /* delete the key and all subkeys */ status = winreg_delete_printer_key(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer, r->in.key_name); if (W_ERROR_IS_OK(status)) { status = winreg_printer_update_changeid(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, printer); } @@ -9576,7 +9576,7 @@ WERROR _spoolss_EnumPrinterDataEx(struct pipes_struct *p, /* now look for a match on the key name */ result = winreg_enum_printer_dataex(p->mem_ctx, - get_server_info_system(), + get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), r->in.key_name, @@ -9984,14 +9984,14 @@ WERROR _spoolss_XcvData(struct pipes_struct *p, switch ( Printer->printer_type ) { case SPLHND_PORTMON_TCP: werror = process_xcvtcp_command(p->mem_ctx, - p->server_info->security_token, + p->session_info->security_token, r->in.function_name, &r->in.in_data, &out_data, r->out.needed); break; case SPLHND_PORTMON_LOCAL: werror = process_xcvlocal_command(p->mem_ctx, - p->server_info->security_token, + p->session_info->security_token, r->in.function_name, &r->in.in_data, &out_data, r->out.needed); diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c index 9d654ec20c..896a9ed7c5 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_util.c +++ b/source3/rpc_server/spoolss/srv_spoolss_util.c @@ -224,7 +224,7 @@ static uint32_t winreg_printer_rev_changeid(void) * * @param[in] mem_ctx The memory context to use. * - * @param[in] server_info The supplied server info. + * @param[in] session_info The supplied server info. * * @param[out] binding_handle A pointer for the winreg dcerpc binding handle. * @@ -245,7 +245,7 @@ static uint32_t winreg_printer_rev_changeid(void) * code if something gone wrong. */ static WERROR winreg_printer_openkey(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct dcerpc_binding_handle **winreg_binding_handle, const char *path, @@ -268,7 +268,7 @@ static WERROR winreg_printer_openkey(TALLOC_CTX *mem_ctx, status = rpcint_binding_handle(mem_ctx, &ndr_table_winreg, &client_id, - server_info, + session_info, msg_ctx, &binding_handle); if (!NT_STATUS_IS_OK(status)) { @@ -656,7 +656,7 @@ done: } static WERROR winreg_printer_opendriver(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *drivername, const char *architecture, @@ -678,7 +678,7 @@ static WERROR winreg_printer_opendriver(TALLOC_CTX *mem_ctx, } result = winreg_printer_openkey(mem_ctx, - server_info, + session_info, msg_ctx, winreg_binding_handle, key_name, @@ -912,7 +912,7 @@ static WERROR winreg_printer_ver_to_dword(const char *str, uint64_t *data) ********************************************************************/ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *sharename) { @@ -944,7 +944,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -966,7 +966,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, /* Create the main key */ result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -1226,7 +1226,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, */ result = winreg_update_printer(tmp_ctx, - server_info, + session_info, msg_ctx, sharename, info2_mask, @@ -1251,7 +1251,7 @@ done: } WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *sharename, uint32_t info2_mask, @@ -1285,7 +1285,7 @@ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -1553,7 +1553,7 @@ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, } } result = winreg_set_printer_secdesc(tmp_ctx, - server_info, + session_info, msg_ctx, sharename, secdesc); @@ -1668,7 +1668,7 @@ done: } WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, struct spoolss_PrinterInfo2 **pinfo2) @@ -1701,7 +1701,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, } result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -1900,7 +1900,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, } result = winreg_get_printer_secdesc(info2, - server_info, + session_info, msg_ctx, printer, &info2->secdesc); @@ -1935,7 +1935,7 @@ done: } WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *sharename, struct spoolss_security_descriptor **psecdesc) @@ -1964,7 +1964,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2005,7 +2005,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, create_default: result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2092,7 +2092,7 @@ done: } WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *sharename, const struct spoolss_security_descriptor *secdesc) @@ -2130,7 +2130,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, size_t size; result = winreg_get_printer_secdesc(tmp_ctx, - server_info, + session_info, msg_ctx, sharename, &old_secdesc); @@ -2175,7 +2175,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2216,7 +2216,7 @@ done: /* Set printer data over the winreg pipe. */ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2251,7 +2251,7 @@ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, DEBUG(8, ("winreg_set_printer_dataex: Open printer key %s, value %s, access_mask: 0x%05x for [%s]\n", key, value, access_mask, printer)); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2299,7 +2299,7 @@ done: /* Get printer data over a winreg pipe. */ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2336,7 +2336,7 @@ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2428,7 +2428,7 @@ done: /* Enumerate on the values of a given key and provide the data. */ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2458,7 +2458,7 @@ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, } result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2508,7 +2508,7 @@ done: /* Delete printer data over a winreg pipe. */ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2539,7 +2539,7 @@ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2584,7 +2584,7 @@ done: /* Enumerate on the subkeys of a given key and provide the data. */ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2618,7 +2618,7 @@ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2672,7 +2672,7 @@ done: /* Delete a key with subkeys of a given printer. */ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key) @@ -2697,7 +2697,7 @@ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, } result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2763,7 +2763,7 @@ done: } WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer) { @@ -2790,7 +2790,7 @@ WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2836,7 +2836,7 @@ done: } WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, uint32_t *pchangeid) @@ -2865,7 +2865,7 @@ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, path, @@ -2924,7 +2924,7 @@ done: */ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct spoolss_AddFormInfo1 *form) { @@ -2949,7 +2949,7 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, TOP_LEVEL_CONTROL_FORMS_KEY, @@ -2964,7 +2964,7 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, goto done; } - result = winreg_printer_enumforms1(tmp_ctx, server_info, msg_ctx, + result = winreg_printer_enumforms1(tmp_ctx, session_info, msg_ctx, &num_info, &info); if (!W_ERROR_IS_OK(result)) { DEBUG(0, ("winreg_printer_addform: Could not enum keys %s: %s\n", @@ -3024,7 +3024,7 @@ done: } WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, uint32_t *pnum_info, union spoolss_FormInfo **pinfo) @@ -3049,7 +3049,7 @@ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, TOP_LEVEL_CONTROL_FORMS_KEY, @@ -3142,7 +3142,7 @@ done: } WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *form_name) { @@ -3171,7 +3171,7 @@ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, TOP_LEVEL_CONTROL_FORMS_KEY, @@ -3224,7 +3224,7 @@ done: } WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *form_name, struct spoolss_AddFormInfo1 *form) @@ -3256,7 +3256,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, TOP_LEVEL_CONTROL_FORMS_KEY, @@ -3273,7 +3273,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, /* If form_name != form->form_name then we renamed the form */ if (strequal(form_name, form->form_name)) { - result = winreg_printer_deleteform1(tmp_ctx, server_info, + result = winreg_printer_deleteform1(tmp_ctx, session_info, msg_ctx, form_name); if (!W_ERROR_IS_OK(result)) { DEBUG(0, ("winreg_printer_setform1: Could not open key %s: %s\n", @@ -3325,7 +3325,7 @@ done: } WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *form_name, struct spoolss_FormInfo1 *r) @@ -3361,7 +3361,7 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, ZERO_STRUCT(key_hnd); result = winreg_printer_openkey(tmp_ctx, - server_info, + session_info, msg_ctx, &winreg_handle, TOP_LEVEL_CONTROL_FORMS_KEY, @@ -3461,7 +3461,7 @@ done: } WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct spoolss_AddDriverInfoCtr *r, const char **driver_name, @@ -3490,7 +3490,7 @@ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, } result = winreg_printer_opendriver(tmp_ctx, - server_info, + session_info, msg_ctx, info8.driver_name, info8.architecture, @@ -3803,7 +3803,7 @@ done: } WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *architecture, const char *driver_name, @@ -3833,7 +3833,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, if (driver_version == DRIVER_ANY_VERSION) { /* look for Win2k first and then for NT4 */ result = winreg_printer_opendriver(tmp_ctx, - server_info, + session_info, msg_ctx, driver_name, architecture, @@ -3844,7 +3844,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, &key_hnd); if (!W_ERROR_IS_OK(result)) { result = winreg_printer_opendriver(tmp_ctx, - server_info, + session_info, msg_ctx, driver_name, architecture, @@ -3857,7 +3857,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, } else { /* ok normal case */ result = winreg_printer_opendriver(tmp_ctx, - server_info, + session_info, msg_ctx, driver_name, architecture, @@ -4075,7 +4075,7 @@ done: } WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct spoolss_DriverInfo8 *info8, uint32_t version) @@ -4097,7 +4097,7 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, /* test that the key exists */ result = winreg_printer_opendriver(tmp_ctx, - server_info, + session_info, msg_ctx, info8->driver_name, info8->architecture, @@ -4166,7 +4166,7 @@ done: } WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *architecture, uint32_t version, @@ -4195,7 +4195,7 @@ WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx, /* use NULL for the driver name so we open the key that is * parent of all drivers for this architecture and version */ result = winreg_printer_opendriver(tmp_ctx, - server_info, + session_info, msg_ctx, NULL, architecture, diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.h b/source3/rpc_server/spoolss/srv_spoolss_util.h index d425bd1bba..4588db54a7 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_util.h +++ b/source3/rpc_server/spoolss/srv_spoolss_util.h @@ -72,7 +72,7 @@ enum spoolss_PrinterInfo2Mask { SPOOLSS_PRINTER_INFO_UNTILTIME WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *sharename); @@ -83,7 +83,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] sharename The share name. * @@ -99,7 +99,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *sharename, uint32_t info2_mask, @@ -113,7 +113,7 @@ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The name of the printer to get. * @@ -123,7 +123,7 @@ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, struct spoolss_PrinterInfo2 **pinfo2); @@ -133,7 +133,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] sharename The share name. * @@ -143,7 +143,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *sharename, struct spoolss_security_descriptor **psecdesc); @@ -153,7 +153,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] sharename The share name. * @@ -163,7 +163,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *sharename, const struct spoolss_security_descriptor *secdesc); @@ -175,7 +175,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The printer name. * @@ -193,7 +193,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -209,7 +209,7 @@ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The printer name. * @@ -227,7 +227,7 @@ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -243,7 +243,7 @@ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The printer name. * @@ -257,7 +257,7 @@ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, * code if something gone wrong. */ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -271,7 +271,7 @@ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The printer name. * @@ -283,7 +283,7 @@ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -296,7 +296,7 @@ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The printer name. * @@ -311,7 +311,7 @@ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx, * code if something gone wrong. */ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -325,7 +325,7 @@ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The printer name. * @@ -335,7 +335,7 @@ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, const char *key); @@ -351,7 +351,7 @@ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The printer name. * @@ -359,7 +359,7 @@ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer); @@ -368,7 +368,7 @@ WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] printer The printer name. * @@ -378,7 +378,7 @@ WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *printer, uint32_t *pchangeid); @@ -391,7 +391,7 @@ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] form The form to add. * @@ -401,7 +401,7 @@ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, * A corresponding DOS error is something went wrong. */ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct spoolss_AddFormInfo1 *form); @@ -410,7 +410,7 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[out] pnum_info A pointer to store the FormInfo count. * @@ -420,7 +420,7 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, uint32_t *pnum_info, union spoolss_FormInfo **pinfo); @@ -430,7 +430,7 @@ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] form_name The name of the form to delete. * @@ -440,7 +440,7 @@ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, * A corresponding DOS error is something went wrong. */ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *form_name); @@ -452,7 +452,7 @@ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] form_name The name of the form to set or rename. * @@ -463,7 +463,7 @@ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx, * A corresponding DOS error is something went wrong. */ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *form_name, struct spoolss_AddFormInfo1 *form); @@ -473,7 +473,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx The talloc memory context to use. * - * @param[in] server_info The server supplied session info. + * @param[in] session_info The server supplied session info. * * @param[in] form_name The name of the form to query. * @@ -483,7 +483,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *form_name, struct spoolss_FormInfo1 *form); @@ -493,7 +493,7 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx A talloc memory context. * - * @param[in] server_info Auth info to open the pipe. + * @param[in] session_info Auth info to open the pipe. * * @param[in] r The structure containing the new driver data. * @@ -505,7 +505,7 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct spoolss_AddDriverInfoCtr *r, const char **driver_name, @@ -516,7 +516,7 @@ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx A talloc memory context. * - * @param[in] server_info Auth info to open the pipe. + * @param[in] session_info Auth info to open the pipe. * * @param[in] architecture The architecture type. * @@ -531,7 +531,7 @@ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, */ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *architecture, const char *driver_name, @@ -543,7 +543,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx A talloc memory context. * - * @param[in] server_info Auth info to open the pipe. + * @param[in] session_info Auth info to open the pipe. * * @param[out] info8 The structure that holds the full driver information. * @@ -554,7 +554,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, */ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct spoolss_DriverInfo8 *info8, uint32_t version); @@ -565,7 +565,7 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, * * @param[in] mem_ctx A talloc memory context. * - * @param[in] server_info Auth info to open the pipe. + * @param[in] session_info Auth info to open the pipe. * * @param[in] architecture The architecture type. * @@ -580,7 +580,7 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, */ WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx, - const struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, const char *architecture, uint32_t version, diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 57b5a0fac5..bb10902e4e 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -526,12 +526,12 @@ static bool pipe_schannel_auth_bind(struct pipes_struct *p, return false; } - ret = server_info_set_session_key(p->server_info, session_key); + ret = session_info_set_session_key(p->session_info, session_key); data_blob_free(&session_key); if (!ret) { - DEBUG(0, ("server_info_set_session_key failed\n")); + DEBUG(0, ("session_info_set_session_key failed\n")); return false; } @@ -622,7 +622,7 @@ static bool pipe_ntlmssp_verify_final(TALLOC_CTX *mem_ctx, enum dcerpc_AuthLevel auth_level, struct client_address *client_id, struct ndr_syntax_id *syntax, - struct auth_serversupplied_info **server_info) + struct auth_serversupplied_info **session_info) { DATA_BLOB session_key; NTSTATUS status; @@ -647,17 +647,17 @@ static bool pipe_ntlmssp_verify_final(TALLOC_CTX *mem_ctx, return false; } - TALLOC_FREE(*server_info); + TALLOC_FREE(*session_info); status = ntlmssp_server_get_user_info(ntlmssp_ctx, - mem_ctx, server_info); + mem_ctx, session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, (__location__ ": failed to obtain the server info " "for authenticated user: %s\n", nt_errstr(status))); return false; } - if ((*server_info)->security_token == NULL) { + if ((*session_info)->security_token == NULL) { DEBUG(1, ("Auth module failed to provide nt_user_token\n")); return false; } @@ -673,7 +673,7 @@ static bool pipe_ntlmssp_verify_final(TALLOC_CTX *mem_ctx, return false; } - ret = server_info_set_session_key((*server_info), session_key); + ret = session_info_set_session_key((*session_info), session_key); data_blob_free(&session_key); if (!ret) { DEBUG(0, ("Failed to set session key!\n")); @@ -728,7 +728,7 @@ err: static NTSTATUS pipe_gssapi_verify_final(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx, struct client_address *client_id, - struct auth_serversupplied_info **server_info) + struct auth_serversupplied_info **session_info) { DATA_BLOB session_key; NTSTATUS status; @@ -745,15 +745,15 @@ static NTSTATUS pipe_gssapi_verify_final(TALLOC_CTX *mem_ctx, } status = gssapi_server_get_user_info(gse_ctx, mem_ctx, - client_id, server_info); + client_id, session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, (__location__ ": failed to obtain the server info " "for authenticated user: %s\n", nt_errstr(status))); return status; } - if ((*server_info)->security_token == NULL) { - status = create_local_token(*server_info); + if ((*session_info)->security_token == NULL) { + status = create_local_token(*session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to create local user token (%s)\n", nt_errstr(status))); @@ -775,7 +775,7 @@ static NTSTATUS pipe_gssapi_verify_final(TALLOC_CTX *mem_ctx, return NT_STATUS_ACCESS_DENIED; } - bret = server_info_set_session_key((*server_info), session_key); + bret = session_info_set_session_key((*session_info), session_key); data_blob_free(&session_key); if (!bret) { return NT_STATUS_ACCESS_DENIED; @@ -800,7 +800,7 @@ static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p) if (!pipe_ntlmssp_verify_final(p, ntlmssp_ctx, p->auth.auth_level, p->client_id, &p->syntax, - &p->server_info)) { + &p->session_info)) { return NT_STATUS_ACCESS_DENIED; } break; @@ -809,7 +809,7 @@ static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p) struct gse_context); status = pipe_gssapi_verify_final(p, gse_ctx, p->client_id, - &p->server_info); + &p->session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("gssapi bind failed with: %s", nt_errstr(status))); @@ -832,7 +832,7 @@ static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p) struct gse_context); status = pipe_gssapi_verify_final(p, gse_ctx, p->client_id, - &p->server_info); + &p->session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("gssapi bind failed with: %s", nt_errstr(status))); @@ -846,7 +846,7 @@ static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p) p->auth.auth_level, p->client_id, &p->syntax, - &p->server_info)) { + &p->session_info)) { return NT_STATUS_ACCESS_DENIED; } break; diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c index f531d04cde..778fa81b86 100644 --- a/source3/rpc_server/srv_pipe_hnd.c +++ b/source3/rpc_server/srv_pipe_hnd.c @@ -411,7 +411,7 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name, const struct tsocket_address *local_address, const struct tsocket_address *remote_address, struct client_address *client_id, - struct auth_serversupplied_info *server_info, + struct auth_serversupplied_info *session_info, struct messaging_context *msg_ctx, struct fake_file_handle **phandle) { @@ -447,7 +447,7 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name, p = make_external_rpc_pipe_p(handle, name, local_address, remote_address, - server_info); + session_info); handle->type = FAKE_FILE_TYPE_NAMED_PIPE_PROXY; handle->private_data = p; @@ -461,7 +461,7 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name, } p = make_internal_rpc_pipe_p(handle, &syntax, client_id, - server_info, msg_ctx); + session_info, msg_ctx); handle->type = FAKE_FILE_TYPE_NAMED_PIPE; handle->private_data = p; diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index cd4ada1b90..31df4886bb 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -271,7 +271,7 @@ static void init_srv_share_info_1(struct pipes_struct *p, remark = talloc_sub_advanced( p->mem_ctx, lp_servicename(snum), get_current_username(), lp_pathname(snum), - p->server_info->utok.uid, get_current_username(), + p->session_info->utok.uid, get_current_username(), "", remark); } @@ -299,7 +299,7 @@ static void init_srv_share_info_2(struct pipes_struct *p, remark = talloc_sub_advanced( p->mem_ctx, lp_servicename(snum), get_current_username(), lp_pathname(snum), - p->server_info->utok.uid, get_current_username(), + p->session_info->utok.uid, get_current_username(), "", remark); } path = talloc_asprintf(p->mem_ctx, @@ -364,7 +364,7 @@ static void init_srv_share_info_501(struct pipes_struct *p, remark = talloc_sub_advanced( p->mem_ctx, lp_servicename(snum), get_current_username(), lp_pathname(snum), - p->server_info->utok.uid, get_current_username(), + p->session_info->utok.uid, get_current_username(), "", remark); } @@ -393,7 +393,7 @@ static void init_srv_share_info_502(struct pipes_struct *p, remark = talloc_sub_advanced( p->mem_ctx, lp_servicename(snum), get_current_username(), lp_pathname(snum), - p->server_info->utok.uid, get_current_username(), + p->session_info->utok.uid, get_current_username(), "", remark); } path = talloc_asprintf(ctx, "C:%s", lp_pathname(snum)); @@ -434,7 +434,7 @@ static void init_srv_share_info_1004(struct pipes_struct *p, remark = talloc_sub_advanced( p->mem_ctx, lp_servicename(snum), get_current_username(), lp_pathname(snum), - p->server_info->utok.uid, get_current_username(), + p->session_info->utok.uid, get_current_username(), "", remark); } @@ -520,7 +520,7 @@ static bool is_enumeration_allowed(struct pipes_struct *p, if (!lp_access_based_share_enum(snum)) return true; - return share_access_check(p->server_info->security_token, lp_servicename(snum), + return share_access_check(p->session_info->security_token, lp_servicename(snum), FILE_READ_DATA); } @@ -1055,7 +1055,7 @@ WERROR _srvsvc_NetFileEnum(struct pipes_struct *p, } if (!nt_token_check_sid(&global_sid_Builtin_Administrators, - p->server_info->security_token)) { + p->session_info->security_token)) { DEBUG(1, ("Enumerating files only allowed for " "administrators\n")); return WERR_ACCESS_DENIED; @@ -1214,7 +1214,7 @@ WERROR _srvsvc_NetConnEnum(struct pipes_struct *p, DEBUG(5,("_srvsvc_NetConnEnum: %d\n", __LINE__)); if (!nt_token_check_sid(&global_sid_Builtin_Administrators, - p->server_info->security_token)) { + p->session_info->security_token)) { DEBUG(1, ("Enumerating connections only allowed for " "administrators\n")); return WERR_ACCESS_DENIED; @@ -1252,7 +1252,7 @@ WERROR _srvsvc_NetSessEnum(struct pipes_struct *p, DEBUG(5,("_srvsvc_NetSessEnum: %d\n", __LINE__)); if (!nt_token_check_sid(&global_sid_Builtin_Administrators, - p->server_info->security_token)) { + p->session_info->security_token)) { DEBUG(1, ("Enumerating sessions only allowed for " "administrators\n")); return WERR_ACCESS_DENIED; @@ -1310,8 +1310,8 @@ WERROR _srvsvc_NetSessDel(struct pipes_struct *p, /* fail out now if you are not root or not a domain admin */ - if ((p->server_info->utok.uid != sec_initial_uid()) && - ( ! nt_token_check_domain_rid(p->server_info->security_token, + if ((p->session_info->utok.uid != sec_initial_uid()) && + ( ! nt_token_check_domain_rid(p->session_info->security_token, DOMAIN_RID_ADMINS))) { goto done; @@ -1324,7 +1324,7 @@ WERROR _srvsvc_NetSessDel(struct pipes_struct *p, NTSTATUS ntstat; - if (p->server_info->utok.uid != sec_initial_uid()) { + if (p->session_info->utok.uid != sec_initial_uid()) { not_root = True; become_root(); } @@ -1579,15 +1579,15 @@ WERROR _srvsvc_NetShareSetInfo(struct pipes_struct *p, if (lp_print_ok(snum)) return WERR_ACCESS_DENIED; - is_disk_op = security_token_has_privilege(p->server_info->security_token, SEC_PRIV_DISK_OPERATOR); + is_disk_op = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_DISK_OPERATOR); /* fail out now if you are not root and not a disk op */ - if ( p->server_info->utok.uid != sec_initial_uid() && !is_disk_op ) { + if ( p->session_info->utok.uid != sec_initial_uid() && !is_disk_op ) { DEBUG(2,("_srvsvc_NetShareSetInfo: uid %u doesn't have the " "SeDiskOperatorPrivilege privilege needed to modify " "share %s\n", - (unsigned int)p->server_info->utok.uid, + (unsigned int)p->session_info->utok.uid, share_name )); return WERR_ACCESS_DENIED; } @@ -1782,9 +1782,9 @@ WERROR _srvsvc_NetShareAdd(struct pipes_struct *p, *r->out.parm_error = 0; } - is_disk_op = security_token_has_privilege(p->server_info->security_token, SEC_PRIV_DISK_OPERATOR); + is_disk_op = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_DISK_OPERATOR); - if (p->server_info->utok.uid != sec_initial_uid() && !is_disk_op ) + if (p->session_info->utok.uid != sec_initial_uid() && !is_disk_op ) return WERR_ACCESS_DENIED; if (!lp_add_share_cmd() || !*lp_add_share_cmd()) { @@ -1988,9 +1988,9 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p, if (lp_print_ok(snum)) return WERR_ACCESS_DENIED; - is_disk_op = security_token_has_privilege(p->server_info->security_token, SEC_PRIV_DISK_OPERATOR); + is_disk_op = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_DISK_OPERATOR); - if (p->server_info->utok.uid != sec_initial_uid() && !is_disk_op ) + if (p->session_info->utok.uid != sec_initial_uid() && !is_disk_op ) return WERR_ACCESS_DENIED; if (!lp_delete_share_cmd() || !*lp_delete_share_cmd()) { @@ -2141,7 +2141,7 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p, } nt_status = create_conn_struct(talloc_tos(), &conn, snum, - lp_pathname(snum), p->server_info, + lp_pathname(snum), p->session_info, &oldcwd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(10, ("create_conn_struct failed: %s\n", @@ -2280,7 +2280,7 @@ WERROR _srvsvc_NetSetFileSecurity(struct pipes_struct *p, } nt_status = create_conn_struct(talloc_tos(), &conn, snum, - lp_pathname(snum), p->server_info, + lp_pathname(snum), p->session_info, &oldcwd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(10, ("create_conn_struct failed: %s\n", @@ -2554,9 +2554,9 @@ WERROR _srvsvc_NetFileClose(struct pipes_struct *p, DEBUG(5,("_srvsvc_NetFileClose: %d\n", __LINE__)); - is_disk_op = security_token_has_privilege(p->server_info->security_token, SEC_PRIV_DISK_OPERATOR); + is_disk_op = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_DISK_OPERATOR); - if (p->server_info->utok.uid != sec_initial_uid() && !is_disk_op) { + if (p->session_info->utok.uid != sec_initial_uid() && !is_disk_op) { return WERR_ACCESS_DENIED; } diff --git a/source3/rpc_server/svcctl/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c index a7af089e7e..e8890e062b 100644 --- a/source3/rpc_server/svcctl/srv_svcctl_nt.c +++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c @@ -278,7 +278,7 @@ WERROR _svcctl_OpenSCManagerW(struct pipes_struct *p, return WERR_NOMEM; se_map_generic( &r->in.access_mask, &scm_generic_map ); - status = svcctl_access_check( sec_desc, p->server_info->security_token, + status = svcctl_access_check( sec_desc, p->session_info->security_token, r->in.access_mask, &access_granted ); if ( !NT_STATUS_IS_OK(status) ) return ntstatus_to_werror( status ); @@ -310,12 +310,12 @@ WERROR _svcctl_OpenServiceW(struct pipes_struct *p, return WERR_BADFID; /* - * Perform access checks. Use the system server_info in order to ensure + * Perform access checks. Use the system session_info in order to ensure * that we retrieve the security descriptor */ sec_desc = svcctl_get_secdesc(p->mem_ctx, p->msg_ctx, - get_server_info_system(), + get_session_info_system(), service); if (sec_desc == NULL) { DEBUG(0, ("_svcctl_OpenServiceW: Failed to get a valid security " @@ -324,7 +324,7 @@ WERROR _svcctl_OpenServiceW(struct pipes_struct *p, } se_map_generic( &r->in.access_mask, &svc_generic_map ); - status = svcctl_access_check( sec_desc, p->server_info->security_token, + status = svcctl_access_check( sec_desc, p->session_info->security_token, r->in.access_mask, &access_granted ); if ( !NT_STATUS_IS_OK(status) ) return ntstatus_to_werror( status ); @@ -367,7 +367,7 @@ WERROR _svcctl_GetServiceDisplayNameW(struct pipes_struct *p, display_name = svcctl_lookup_dispname(p->mem_ctx, p->msg_ctx, - p->server_info, + p->session_info, service); if (!display_name) { display_name = ""; @@ -406,7 +406,7 @@ WERROR _svcctl_QueryServiceStatus(struct pipes_struct *p, static int enumerate_status(TALLOC_CTX *ctx, struct messaging_context *msg_ctx, - struct auth_serversupplied_info *server_info, + struct auth_serversupplied_info *session_info, struct ENUM_SERVICE_STATUSW **status) { int num_services = 0; @@ -428,7 +428,7 @@ static int enumerate_status(TALLOC_CTX *ctx, display_name = svcctl_lookup_dispname(ctx, msg_ctx, - server_info, + session_info, svcctl_ops[i].name); st[i].display_name = talloc_strdup(st, display_name ? display_name : ""); @@ -466,7 +466,7 @@ WERROR _svcctl_EnumServicesStatusW(struct pipes_struct *p, num_services = enumerate_status(p->mem_ctx, p->msg_ctx, - p->server_info, + p->session_info, &services); if (num_services == -1 ) { return WERR_NOMEM; @@ -667,7 +667,7 @@ WERROR _svcctl_QueryServiceStatusEx(struct pipes_struct *p, static WERROR fill_svc_config(TALLOC_CTX *ctx, struct messaging_context *msg_ctx, - struct auth_serversupplied_info *server_info, + struct auth_serversupplied_info *session_info, const char *name, struct QUERY_SERVICE_CONFIG *config) { @@ -678,12 +678,12 @@ static WERROR fill_svc_config(TALLOC_CTX *ctx, config->displayname = svcctl_lookup_dispname(mem_ctx, msg_ctx, - server_info, + session_info, name); result = svcctl_get_string_value(mem_ctx, msg_ctx, - server_info, + session_info, name, "ObjectName"); if (result != NULL) { @@ -692,7 +692,7 @@ static WERROR fill_svc_config(TALLOC_CTX *ctx, result = svcctl_get_string_value(mem_ctx, msg_ctx, - server_info, + session_info, name, "ImagePath"); if (result != NULL) { @@ -749,7 +749,7 @@ WERROR _svcctl_QueryServiceConfigW(struct pipes_struct *p, wresult = fill_svc_config(p->mem_ctx, p->msg_ctx, - p->server_info, + p->session_info, info->name, r->out.query); if ( !W_ERROR_IS_OK(wresult) ) @@ -798,7 +798,7 @@ WERROR _svcctl_QueryServiceConfig2W(struct pipes_struct *p, description = svcctl_lookup_description(p->mem_ctx, p->msg_ctx, - p->server_info, + p->session_info, info->name); desc_buf.description = description; @@ -921,7 +921,7 @@ WERROR _svcctl_QueryServiceObjectSecurity(struct pipes_struct *p, /* Lookup the security descriptor and marshall it up for a reply */ sec_desc = svcctl_get_secdesc(p->mem_ctx, p->msg_ctx, - get_server_info_system(), + get_session_info_system(), info->name); if (sec_desc == NULL) { return WERR_NOMEM; @@ -997,7 +997,7 @@ WERROR _svcctl_SetServiceObjectSecurity(struct pipes_struct *p, /* store the new SD */ - if (!svcctl_set_secdesc(p->msg_ctx, p->server_info, info->name, sec_desc)) + if (!svcctl_set_secdesc(p->msg_ctx, p->session_info, info->name, sec_desc)) return WERR_ACCESS_DENIED; return WERR_OK; diff --git a/source3/rpc_server/svcctl/srv_svcctl_reg.c b/source3/rpc_server/svcctl/srv_svcctl_reg.c index 84c5f434ee..f4876222fb 100644 --- a/source3/rpc_server/svcctl/srv_svcctl_reg.c +++ b/source3/rpc_server/svcctl/srv_svcctl_reg.c @@ -574,7 +574,7 @@ bool svcctl_init_winreg(struct messaging_context *msg_ctx) } status = dcerpc_winreg_int_hklm_openkey(tmp_ctx, - get_server_info_system(), + get_session_info_system(), msg_ctx, &h, key, diff --git a/source3/rpc_server/winreg/srv_winreg_nt.c b/source3/rpc_server/winreg/srv_winreg_nt.c index 379fe57c38..1b54d37f69 100644 --- a/source3/rpc_server/winreg/srv_winreg_nt.c +++ b/source3/rpc_server/winreg/srv_winreg_nt.c @@ -68,7 +68,7 @@ static WERROR open_registry_key(struct pipes_struct *p, if (parent == NULL) { result = reg_openhive(p->mem_ctx, subkeyname, access_desired, - p->server_info->security_token, &key); + p->session_info->security_token, &key); } else { result = reg_openkey(p->mem_ctx, parent, subkeyname, @@ -577,7 +577,7 @@ WERROR _winreg_InitiateSystemShutdownEx(struct pipes_struct *p, return WERR_NOMEM; } - can_shutdown = security_token_has_privilege(p->server_info->security_token, SEC_PRIV_REMOTE_SHUTDOWN); + can_shutdown = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_REMOTE_SHUTDOWN); /* IF someone has privs, run the shutdown script as root. OTHERWISE run it as not root Take the error return from the script and provide it as the Windows return code. */ @@ -614,7 +614,7 @@ WERROR _winreg_AbortSystemShutdown(struct pipes_struct *p, if (!*abort_shutdown_script) return WERR_ACCESS_DENIED; - can_shutdown = security_token_has_privilege(p->server_info->security_token, SEC_PRIV_REMOTE_SHUTDOWN); + can_shutdown = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_REMOTE_SHUTDOWN); /********** BEGIN SeRemoteShutdownPrivilege BLOCK **********/ @@ -704,7 +704,7 @@ WERROR _winreg_RestoreKey(struct pipes_struct *p, /* user must posses SeRestorePrivilege for this this proceed */ - if ( !security_token_has_privilege(p->server_info->security_token, SEC_PRIV_RESTORE)) { + if ( !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_RESTORE)) { return WERR_ACCESS_DENIED; } diff --git a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c index 4cbf70c80f..205f7601e1 100644 --- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c +++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c @@ -352,7 +352,7 @@ WERROR _wkssvc_NetWkstaGetInfo(struct pipes_struct *p, case 101: /* Level 101 can be allowed from any logged in user */ if (!nt_token_check_sid(&global_sid_Authenticated_Users, - p->server_info->security_token)) { + p->session_info->security_token)) { DEBUG(1,("User not allowed for NetWkstaGetInfo level " "101\n")); DEBUGADD(3,(" - does not have sid for Authenticated " @@ -360,7 +360,7 @@ WERROR _wkssvc_NetWkstaGetInfo(struct pipes_struct *p, sid_string_dbg( &global_sid_Authenticated_Users))); security_token_debug(DBGC_CLASS, 3, - p->server_info->security_token); + p->session_info->security_token); return WERR_ACCESS_DENIED; } r->out.info->info101 = create_wks_info_101(p->mem_ctx); @@ -371,14 +371,14 @@ WERROR _wkssvc_NetWkstaGetInfo(struct pipes_struct *p, case 102: /* Level 102 Should only be allowed from a domain administrator */ if (!nt_token_check_sid(&global_sid_Builtin_Administrators, - p->server_info->security_token)) { + p->session_info->security_token)) { DEBUG(1,("User not allowed for NetWkstaGetInfo level " "102\n")); DEBUGADD(3,(" - does not have sid for Administrators " "group %s, sids are:\n", sid_string_dbg(&global_sid_Builtin_Administrators))); security_token_debug(DBGC_CLASS, 3, - p->server_info->security_token); + p->session_info->security_token); return WERR_ACCESS_DENIED; } r->out.info->info102 = create_wks_info_102(p->mem_ctx); @@ -557,12 +557,12 @@ WERROR _wkssvc_NetWkstaEnumUsers(struct pipes_struct *p, { /* This with any level should only be allowed from a domain administrator */ if (!nt_token_check_sid(&global_sid_Builtin_Administrators, - p->server_info->security_token)) { + p->session_info->security_token)) { DEBUG(1,("User not allowed for NetWkstaEnumUsers\n")); DEBUGADD(3,(" - does not have sid for Administrators group " "%s\n", sid_string_dbg( &global_sid_Builtin_Administrators))); - security_token_debug(DBGC_CLASS, 3, p->server_info->security_token); + security_token_debug(DBGC_CLASS, 3, p->session_info->security_token); return WERR_ACCESS_DENIED; } @@ -813,7 +813,7 @@ WERROR _wkssvc_NetrJoinDomain2(struct pipes_struct *p, char *admin_domain = NULL; char *admin_account = NULL; WERROR werr; - struct security_token *token = p->server_info->security_token; + struct security_token *token = p->session_info->security_token; if (!r->in.domain_name) { return WERR_INVALID_PARAM; @@ -838,7 +838,7 @@ WERROR _wkssvc_NetrJoinDomain2(struct pipes_struct *p, werr = decode_wkssvc_join_password_buffer( p->mem_ctx, r->in.encrypted_password, - &p->server_info->user_session_key, &cleartext_pwd); + &p->session_info->user_session_key, &cleartext_pwd); if (!W_ERROR_IS_OK(werr)) { return werr; } @@ -888,7 +888,7 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct pipes_struct *p, char *admin_domain = NULL; char *admin_account = NULL; WERROR werr; - struct security_token *token = p->server_info->security_token; + struct security_token *token = p->session_info->security_token; if (!r->in.account || !r->in.encrypted_password) { return WERR_INVALID_PARAM; @@ -904,7 +904,7 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct pipes_struct *p, werr = decode_wkssvc_join_password_buffer( p->mem_ctx, r->in.encrypted_password, - &p->server_info->user_session_key, &cleartext_pwd); + &p->session_info->user_session_key, &cleartext_pwd); if (!W_ERROR_IS_OK(werr)) { return werr; } |