diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-26 22:08:22 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:06 +1000 |
| commit | d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a (patch) | |
| tree | 8e42569543c2a7a591d206794542290c64a7cebe /source3/rpc_server/srv_spoolss_nt.c | |
| parent | 4bfc8d3b1a6f6deacb8845c5d81b4897cc292cfb (diff) | |
| download | samba-d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a.tar.gz samba-d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a.tar.bz2 samba-d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a.zip | |
s3:auth Remove NT_USER_TOKEN
The all UPPER case typedef is no longer the preferred Samba style
and this makes it easier to see that this is the IDL-derivied structure
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/rpc_server/srv_spoolss_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 9a9e3f52f1..58896b3c49 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -150,7 +150,7 @@ const struct standard_mapping printserver_std_mapping = { struct xcv_api_table { const char *name; - WERROR(*fn) (TALLOC_CTX *mem_ctx, NT_USER_TOKEN *token, DATA_BLOB *in, DATA_BLOB *out, uint32_t *needed); + WERROR(*fn) (TALLOC_CTX *mem_ctx, struct security_token *token, DATA_BLOB *in, DATA_BLOB *out, uint32_t *needed); }; static void prune_printername_cache(void); @@ -357,7 +357,7 @@ static bool close_printer_handle(struct pipes_struct *p, struct policy_handle *h Delete a printer given a handle. ****************************************************************************/ -static WERROR delete_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, +static WERROR delete_printer_hook(TALLOC_CTX *ctx, struct security_token *token, const char *sharename, struct messaging_context *msg_ctx) { @@ -5859,7 +5859,7 @@ static bool check_printer_ok(TALLOC_CTX *mem_ctx, /**************************************************************************** ****************************************************************************/ -static WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char *portname, const char *uri) +static WERROR add_port_hook(TALLOC_CTX *ctx, struct security_token *token, const char *portname, const char *uri) { char *cmd = lp_addport_cmd(); char *command = NULL; @@ -5908,7 +5908,7 @@ static WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char *p /**************************************************************************** ****************************************************************************/ -static bool add_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, +static bool add_printer_hook(TALLOC_CTX *ctx, struct security_token *token, struct spoolss_SetPrinterInfo2 *info2, const char *remote_machine, struct messaging_context *msg_ctx) @@ -9540,7 +9540,7 @@ static bool push_monitorui_buf(TALLOC_CTX *mem_ctx, DATA_BLOB *buf, *******************************************************************/ static WERROR xcvtcp_monitorui(TALLOC_CTX *mem_ctx, - NT_USER_TOKEN *token, DATA_BLOB *in, + struct security_token *token, DATA_BLOB *in, DATA_BLOB *out, uint32_t *needed) { const char *dllname = "tcpmonui.dll"; @@ -9595,7 +9595,7 @@ static bool pull_port_data_2(TALLOC_CTX *mem_ctx, *******************************************************************/ static WERROR xcvtcp_addport(TALLOC_CTX *mem_ctx, - NT_USER_TOKEN *token, DATA_BLOB *in, + struct security_token *token, DATA_BLOB *in, DATA_BLOB *out, uint32_t *needed) { struct spoolss_PortData1 port1; @@ -9687,7 +9687,7 @@ struct xcv_api_table xcvtcp_cmds[] = { }; static WERROR process_xcvtcp_command(TALLOC_CTX *mem_ctx, - NT_USER_TOKEN *token, const char *command, + struct security_token *token, const char *command, DATA_BLOB *inbuf, DATA_BLOB *outbuf, uint32_t *needed ) @@ -9709,7 +9709,7 @@ static WERROR process_xcvtcp_command(TALLOC_CTX *mem_ctx, #if 0 /* don't support management using the "Local Port" monitor */ static WERROR xcvlocal_monitorui(TALLOC_CTX *mem_ctx, - NT_USER_TOKEN *token, DATA_BLOB *in, + struct security_token *token, DATA_BLOB *in, DATA_BLOB *out, uint32_t *needed) { const char *dllname = "localui.dll"; @@ -9746,7 +9746,7 @@ struct xcv_api_table xcvlocal_cmds[] = { *******************************************************************/ static WERROR process_xcvlocal_command(TALLOC_CTX *mem_ctx, - NT_USER_TOKEN *token, const char *command, + struct security_token *token, const char *command, DATA_BLOB *inbuf, DATA_BLOB *outbuf, uint32_t *needed) { |