diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-01 04:45:33 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-01 04:45:33 +0100 |
| commit | 08259c1c52a9921de6fba08939130698b474f382 (patch) | |
| tree | 2e563ba2d2dd10d34965f0de5b2c56118065d0f1 /source3/include | |
| parent | 2dc045007ef68bc42822471a3a08c8f094e29980 (diff) | |
| download | samba-08259c1c52a9921de6fba08939130698b474f382.tar.gz samba-08259c1c52a9921de6fba08939130698b474f382.tar.bz2 samba-08259c1c52a9921de6fba08939130698b474f382.zip | |
Add iconv_convenience argument to size functions.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 3f35602ba6..64be27336d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -559,7 +559,6 @@ typedef char fstring[FSTRING_LEN]; #endif /* Samba 3 doesn't use iconv_convenience: */ -extern void *global_iconv_convenience; extern void *cmdline_lp_ctx; struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); diff --git a/source3/include/proto.h b/source3/include/proto.h index be34bb0e65..e1e98eb125 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2307,19 +2307,6 @@ _PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss); const char *ndr_errstr(enum ndr_err_code err); -/* The following definitions come from librpc/ndr/ndr_sec_helper.c */ - -size_t ndr_size_dom_sid(const struct dom_sid *sid, int flags); -size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags); -size_t ndr_size_dom_sid0(const struct dom_sid *sid, int flags); -size_t ndr_size_security_ace(const struct security_ace *ace, int flags); -size_t ndr_size_security_acl(const struct security_acl *acl, int flags); -size_t ndr_size_security_descriptor(const struct security_descriptor *sd, int flags); -void ndr_print_dom_sid(struct ndr_print *ndr, const char *name, const struct dom_sid *sid); -void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, const struct dom_sid *sid); -void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, const struct dom_sid *sid); -void ndr_print_dom_sid0(struct ndr_print *ndr, const char *name, const struct dom_sid *sid); - /* The following definitions come from librpc/ndr/sid.c */ char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid); |