diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-17 15:24:20 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-17 15:24:20 -0700 |
| commit | 39971fff27f71b514308d10d7a2d8c3fb58c2420 (patch) | |
| tree | 101f2adac9ef41af17579d22f6ddd56ada62ce5d /source3/include/proto.h | |
| parent | 23676b6e9e8aad0ac2aa78d04e65f637b4551527 (diff) | |
| parent | e71d9728f52e969e07927c5b38fa062c6ef6d1eb (diff) | |
| download | samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.gz samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.bz2 samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source3/include/proto.h')
| -rw-r--r-- | source3/include/proto.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 007ee9f223..1d8a6cd9fa 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -3297,12 +3297,6 @@ const char *smb_dos_err_class(uint8 e_class); char *smb_dos_errstr(char *inbuf); WERROR map_werror_from_unix(int error); -/* The following definitions come from libsmb/spnego.c */ - -ssize_t read_spnego_data(DATA_BLOB data, SPNEGO_DATA *token); -ssize_t write_spnego_data(DATA_BLOB *blob, SPNEGO_DATA *spnego); -bool free_spnego_data(SPNEGO_DATA *spnego); - /* The following definitions come from libsmb/trustdom_cache.c */ bool trustdom_cache_enable(void); @@ -5620,6 +5614,10 @@ NTSTATUS serverinfo_to_SamInfo3(struct auth_serversupplied_info *server_info, uint8_t *pipe_session_key, size_t pipe_session_key_len, struct netr_SamInfo3 *sam3); +NTSTATUS serverinfo_to_SamInfo6(struct auth_serversupplied_info *server_info, + uint8_t *pipe_session_key, + size_t pipe_session_key_len, + struct netr_SamInfo6 *sam6); void init_netr_CryptPassword(const char *pwd, unsigned char session_key[16], struct netr_CryptPassword *pwd_buf); @@ -6574,6 +6572,7 @@ void send_nt_replies(connection_struct *conn, char *params, int paramsize, char *pdata, int datasize); void reply_ntcreate_and_X(struct smb_request *req); +struct ea_list *read_nttrans_ea_list(TALLOC_CTX *ctx, const char *pdata, size_t data_size); void reply_ntcancel(struct smb_request *req); void reply_ntrename(struct smb_request *req); void reply_nttrans(struct smb_request *req); |