lib/util/charset: Remove 'display charset'

[samba.git] / source3 / include / proto.h

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1cde4be9a6ab7b2e2539966dbed6cfc2b7277870..31c75189fc12dd7497e6ca0de58c44688940a616 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -73,14 +73,6 @@ int bitmap_find(struct bitmap *bm, unsigned ofs);
 /* The following definitions come from lib/charcnv.c  */
 
 void gfree_charcnv(void);
-bool convert_string(charset_t from, charset_t to,
-                     void const *src, size_t srclen, 
-                     void *dest, size_t destlen,
-                     size_t *converted_size);
-bool convert_string_error(charset_t from, charset_t to,
-                           void const *src, size_t srclen,
-                           void *dest, size_t destlen,
-                           size_t *converted_size);
 size_t ucs2_align(const void *base_ptr, const void *p, int flags);
 size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags);
 size_t push_ascii_fstring(void *dest, const char *src);
@@ -913,6 +905,8 @@ unsigned wins_srv_count(void);
 char **wins_srv_tags(void);
 void wins_srv_tags_free(char **list);
 struct in_addr wins_srv_ip_tag(const char *tag, struct in_addr src_ip);
+bool wins_server_tag_ips(const char *tag, TALLOC_CTX *mem_ctx,
+                        struct in_addr **pservers, int *pnum_servers);
 unsigned wins_srv_count_tag(const char *tag);
 
 /* The following definitions come from libsmb/clispnego.c  */
@@ -980,9 +974,6 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
 /* The following definitions come from libsmb/errormap.c  */
 
 NTSTATUS dos_to_ntstatus(uint8 eclass, uint32 ecode);
-void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode);
-NTSTATUS werror_to_ntstatus(WERROR error);
-WERROR ntstatus_to_werror(NTSTATUS error);
 NTSTATUS map_nt_error_from_gss(uint32 gss_maj, uint32 minor);
 
 /* The following definitions come from libsmb/namecache.c  */
@@ -1045,14 +1036,29 @@ NTSTATUS name_query(const char *name, int name_type,
                    TALLOC_CTX *mem_ctx,
                    struct sockaddr_storage **addrs,
                    int *num_addrs, uint8_t *flags);
+struct tevent_req *name_resolve_bcast_send(TALLOC_CTX *mem_ctx,
+                                          struct tevent_context *ev,
+                                          const char *name,
+                                          int name_type);
+NTSTATUS name_resolve_bcast_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                                struct sockaddr_storage **addrs,
+                                int *num_addrs);
 NTSTATUS name_resolve_bcast(const char *name,
                        int name_type,
                        TALLOC_CTX *mem_ctx,
                        struct sockaddr_storage **return_iplist,
                        int *return_count);
+struct tevent_req *resolve_wins_send(TALLOC_CTX *mem_ctx,
+                                    struct tevent_context *ev,
+                                    const char *name,
+                                    int name_type);
+NTSTATUS resolve_wins_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                          struct sockaddr_storage **addrs,
+                          int *num_addrs, uint8_t *flags);
 NTSTATUS resolve_wins(const char *name,
                int name_type,
-               struct ip_service **return_iplist,
+               TALLOC_CTX *mem_ctx,
+               struct sockaddr_storage **return_iplist,
                int *return_count);
 NTSTATUS internal_resolve_name(const char *name,
                                int name_type,
@@ -1088,13 +1094,6 @@ bool get_dc_name(const char *domain,
                fstring srv_name,
                struct sockaddr_storage *ss_out);
 
-/* The following definitions come from libsmb/nterr.c  */
-
-const char *nt_errstr(NTSTATUS nt_code);
-const char *get_friendly_nt_error_msg(NTSTATUS nt_code);
-NTSTATUS nt_status_string_to_code(const char *nt_status_str);
-NTSTATUS nt_status_squash(NTSTATUS nt_status);
-
 /* The following definitions come from libsmb/ntlmssp.c  */
 struct ntlmssp_state;
 NTSTATUS ntlmssp_set_username(struct ntlmssp_state *ntlmssp_state, const char *user) ;
@@ -1175,7 +1174,6 @@ NTSTATUS change_trust_account_password( const char *domain, const char *remote_m
 const char *lp_smb_ports(void);
 const char *lp_dos_charset(void);
 const char *lp_unix_charset(void);
-const char *lp_display_charset(void);
 char *lp_logfile(void);
 char *lp_configfile(void);
 const char *lp_smb_passwd_file(void);