diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-18 20:04:42 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-18 20:04:42 -0400 |
| commit | 7e4de49bfceed18c81abf93703a61d0a22617a24 (patch) | |
| tree | 37b74b75d0edcfe28ce4d9898c0889a74b262492 /source3/include | |
| parent | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (diff) | |
| parent | 27aece72004a84a6e0b2e00987d8a362e307d1d8 (diff) | |
| download | samba-7e4de49bfceed18c81abf93703a61d0a22617a24.tar.gz samba-7e4de49bfceed18c81abf93703a61d0a22617a24.tar.bz2 samba-7e4de49bfceed18c81abf93703a61d0a22617a24.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 5 | ||||
| -rw-r--r-- | source3/include/rpc_dce.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index ad16e7e52f..9471f63195 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2937,6 +2937,7 @@ NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code); void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v); uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob); void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v); +uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob); NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt, TALLOC_CTX *mem_ctx, DATA_BLOB *pkt_auth_blob, @@ -6166,6 +6167,10 @@ int sessionid_traverse_read(int (*fn)(const char *key, /* The following definitions come from smbd/sesssetup.c */ +NTSTATUS do_map_to_guest(NTSTATUS status, + struct auth_serversupplied_info **server_info, + const char *user, const char *domain); + NTSTATUS parse_spnego_mechanisms(DATA_BLOB blob_in, DATA_BLOB *pblob_out, char **kerb_mechOID); diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h index 7be8a8a6f7..2cc770e11c 100644 --- a/source3/include/rpc_dce.h +++ b/source3/include/rpc_dce.h @@ -22,8 +22,6 @@ #ifndef _DCE_RPC_H /* _DCE_RPC_H */ #define _DCE_RPC_H -#define SCHANNEL_SIG_SIZE 0x20 - /* Maximum size of the signing data in a fragment. */ #define RPC_MAX_SIGN_SIZE 0x38 /* 56 */ |