diff options
author | Luke Leighton <lkcl@samba.org> | 2000-01-21 02:33:21 +0000 |
---|---|---|
committer | Luke Leighton <lkcl@samba.org> | 2000-01-21 02:33:21 +0000 |
commit | d91bfabc5df7226cc1b0da231e18fd16c8807a25 (patch) | |
tree | 89f60e66ddc179fe3ead12f4c05fac6854cbf4fb /source3/include | |
parent | d85e6f2c9a5ca97f47b3c6b7b86f4ca07a8133c2 (diff) | |
download | samba-d91bfabc5df7226cc1b0da231e18fd16c8807a25.tar.gz samba-d91bfabc5df7226cc1b0da231e18fd16c8807a25.tar.bz2 samba-d91bfabc5df7226cc1b0da231e18fd16c8807a25.zip |
made cvs main up-to-date with samba_tng, with addition of process id to
msrpc loop-back interface.
(This used to be commit adbf97c0a93149e17496b002ecc8ecdb3f360ed5)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/proto.h | 6 | ||||
-rw-r--r-- | source3/include/rpc_creds.h | 2 | ||||
-rw-r--r-- | source3/include/smb.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 9b25b5e865..f78f19cb40 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -136,9 +136,10 @@ void msrpc_init_creds(struct msrpc_state *msrpc, const struct user_creds *usr); void msrpc_close_socket(struct msrpc_state *msrpc); void msrpc_sockopt(struct msrpc_state *msrpc, char *options); BOOL msrpc_connect_auth(struct msrpc_state *msrpc, + uint32 pid, const char* pipename, const struct user_creds *usr); -struct msrpc_state *msrpc_initialise(struct msrpc_state *msrpc); +struct msrpc_state *msrpc_initialise(struct msrpc_state *msrpc, uint32 pid); void msrpc_shutdown(struct msrpc_state *msrpc); BOOL msrpc_establish_connection(struct msrpc_state *msrpc, const char *pipe_name); @@ -148,6 +149,7 @@ BOOL msrpc_establish_connection(struct msrpc_state *msrpc, void init_msrpc_use(void); void free_msrpc_use(void); struct msrpc_state *msrpc_use_add(const char* pipe_name, + uint32 pid, const struct user_creds *usr_creds, BOOL redir); BOOL msrpc_use_del(const char* pipe_name, @@ -1704,11 +1706,13 @@ BOOL creds_io_cmd(char *desc, CREDS_CMD *r_u, prs_struct *ps, int depth); BOOL create_ntuser_creds( prs_struct *ps, const char* name, uint16 version, uint16 command, + uint32 pid, const struct ntuser_creds *ntu, BOOL reuse); BOOL create_user_creds( prs_struct *ps, const char* name, uint16 version, uint16 command, + uint32 pid, const struct user_creds *usr); /*The following definitions come from rpc_parse/parse_lsa.c */ diff --git a/source3/include/rpc_creds.h b/source3/include/rpc_creds.h index 7869fe339c..3247e1efdf 100644 --- a/source3/include/rpc_creds.h +++ b/source3/include/rpc_creds.h @@ -62,6 +62,7 @@ typedef struct ntsec_creds typedef struct user_creds { BOOL reuse; + uint32 ptr_ntc; uint32 ptr_uxc; uint32 ptr_nts; @@ -82,6 +83,7 @@ typedef struct cred_command { uint16 version; uint16 command; + uint32 pid; /* unique process id */ fstring name; diff --git a/source3/include/smb.h b/source3/include/smb.h index 4527ff9bff..8d4a367179 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1832,6 +1832,8 @@ struct msrpc_state BOOL initialised; char *inbuf; char *outbuf; + + uint32 pid; }; #include "client.h" #include "rpcclient.h" |