diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-26 15:28:18 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-26 15:28:18 +0100 |
commit | 30a3dec549dc408940710409c80276077b4d9701 (patch) | |
tree | b0c0106ccbb9874875100ae5e18ec301e5c9f777 /source3/include/proto.h | |
parent | c42fc5e103d9d210c2f370e237a952e6df361792 (diff) | |
parent | 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346 (diff) | |
download | samba-30a3dec549dc408940710409c80276077b4d9701.tar.gz samba-30a3dec549dc408940710409c80276077b4d9701.tar.bz2 samba-30a3dec549dc408940710409c80276077b4d9701.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
Diffstat (limited to 'source3/include/proto.h')
-rw-r--r-- | source3/include/proto.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 3b4b1cf3f1..77be0aba09 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5693,10 +5693,8 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli, bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth); bool smb_io_system_time(const char *desc, prs_struct *ps, int depth, SYSTEMTIME *systime); bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime); -bool smb_io_dom_sid(const char *desc, DOM_SID *sid, prs_struct *ps, int depth); bool smb_io_uuid(const char *desc, struct GUID *uuid, prs_struct *ps, int depth); -void init_unistr(UNISTR *str, const char *buf); void init_unistr2(UNISTR2 *str, const char *buf, enum unistr2_term_codes flags); /* The following definitions come from rpc_parse/parse_prs.c */ @@ -5818,11 +5816,6 @@ bool smb_io_rpc_auth_schannel_chk(const char *desc, int auth_len, RPC_AUTH_SCHANNEL_CHK * chk, prs_struct *ps, int depth); -/* The following definitions come from rpc_parse/parse_sec.c */ - -bool sec_io_desc(const char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth); -bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF **ppsdb, prs_struct *ps, int depth); - /* The following definitions come from rpc_server/srv_eventlog_lib.c */ TDB_CONTEXT *elog_init_tdb( char *tdbfilename ); |