diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 12 | ||||
| -rw-r--r-- | source3/librpc/ndr/util.c | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 3e48d168054..132d37380f2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -601,7 +601,6 @@ typedef char fstring[FSTRING_LEN]; /* Samba 3 doesn't use iconv_convenience: */ extern void *cmdline_lp_ctx; -struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); /* Lists, trees, caching, database... */ #include "../lib/util/util.h" diff --git a/source3/include/proto.h b/source3/include/proto.h index 6099ecf0e98..eb9c63c5ac4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1294,14 +1294,10 @@ struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) ; /* The following definitions come from ..libcli/registry/util_reg.c */ const char *str_regtype(int type); -bool push_reg_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, - DATA_BLOB *blob, const char *s); -bool push_reg_multi_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, - DATA_BLOB *blob, const char **a); -bool pull_reg_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, - const DATA_BLOB *blob, const char **s); -bool pull_reg_multi_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, - const DATA_BLOB *blob, const char ***a); +bool push_reg_sz(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char *s); +bool push_reg_multi_sz(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char **a); +bool pull_reg_sz(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const char **s); +bool pull_reg_multi_sz(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const char ***a); /* The following definitions come from lib/util_seaccess.c */ diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c index 1318bd8e00f..5966ca8679c 100644 --- a/source3/librpc/ndr/util.c +++ b/source3/librpc/ndr/util.c @@ -209,10 +209,6 @@ _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name } void *cmdline_lp_ctx; -struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx) -{ - return NULL; -} const struct ndr_syntax_id null_ndr_syntax_id = { { 0, 0, 0, { 0, 0 }, { 0, 0, 0, 0, 0, 0 } }, 0 }; |