summaryrefslogtreecommitdiffstats
path: root/source3/rpc_server/spoolss
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-18 12:58:25 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:13 +1000
commit128ae06a619b2c50cc9379053abb18277e814747 (patch)
treef3c7c0639a4adcbcff13cbfb1322cee0b08cba1a /source3/rpc_server/spoolss
parent8d72e612ac2845cd873c4fd614456fe8749db130 (diff)
downloadsamba-128ae06a619b2c50cc9379053abb18277e814747.tar.gz
samba-128ae06a619b2c50cc9379053abb18277e814747.tar.xz
samba-128ae06a619b2c50cc9379053abb18277e814747.zip
s3-auth use auth_user_info not netr_SamInfo3 in auth3_session_info
This makes auth3_session_info identical to auth_session_info The logic to convert the info3 to a struct auth_user_info is essentially moved up the stack from the named pipe proxy in source3/rpc_server to create_local_token(). Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/rpc_server/spoolss')
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_nt.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 12dcc27615..71ae93766a 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -1832,7 +1832,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
!nt_token_check_sid(&global_sid_Builtin_Print_Operators, p->session_info->security_token) &&
!token_contains_name_in_list(
uidtoname(p->session_info->unix_token->uid),
- p->session_info->info3->base.domain.string,
+ p->session_info->info->domain_name,
NULL,
p->session_info->security_token,
lp_printer_admin(snum))) {
@@ -2095,7 +2095,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p,
&& !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_PRINT_OPERATOR)
&& !token_contains_name_in_list(
uidtoname(p->session_info->unix_token->uid),
- p->session_info->info3->base.domain.string,
+ p->session_info->info->domain_name,
NULL,
p->session_info->security_token,
lp_printer_admin(-1)) )
@@ -2199,7 +2199,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p,
&& !security_token_has_privilege(p->session_info->security_token, SEC_PRIV_PRINT_OPERATOR)
&& !token_contains_name_in_list(
uidtoname(p->session_info->unix_token->uid),
- p->session_info->info3->base.domain.string,
+ p->session_info->info->domain_name,
NULL,
p->session_info->security_token, lp_printer_admin(-1)) )
{
@@ -8553,7 +8553,7 @@ WERROR _spoolss_AddForm(struct pipes_struct *p,
if ((p->session_info->unix_token->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->unix_token->uid),
- p->session_info->info3->base.domain.string,
+ p->session_info->info->domain_name,
NULL,
p->session_info->security_token,
lp_printer_admin(snum))) {
@@ -8626,7 +8626,7 @@ WERROR _spoolss_DeleteForm(struct pipes_struct *p,
if ((p->session_info->unix_token->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->unix_token->uid),
- p->session_info->info3->base.domain.string,
+ p->session_info->info->domain_name,
NULL,
p->session_info->security_token,
lp_printer_admin(snum))) {
@@ -8695,7 +8695,7 @@ WERROR _spoolss_SetForm(struct pipes_struct *p,
if ((p->session_info->unix_token->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->unix_token->uid),
- p->session_info->info3->base.domain.string,
+ p->session_info->info->domain_name,
NULL,
p->session_info->security_token,
lp_printer_admin(snum))) {