diff options
| -rw-r--r-- | source3/include/ctdbd_conn.h | 4 | ||||
| -rw-r--r-- | source3/include/dbwrap.h | 5 | ||||
| -rw-r--r-- | source3/include/proto.h | 21 | ||||
| -rw-r--r-- | source3/libads/ads_ldap_protos.h | 1 | ||||
| -rw-r--r-- | source3/torture/proto.h | 1 | ||||
| -rw-r--r-- | source3/winbindd/idmap_adex/idmap_adex.h | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_proto.h | 1 |
7 files changed, 0 insertions, 35 deletions
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h index 80cf717499..9530d1e3fc 100644 --- a/source3/include/ctdbd_conn.h +++ b/source3/include/ctdbd_conn.h @@ -66,10 +66,6 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, NTSTATUS ctdbd_register_reconfigure(struct ctdbd_connection *conn); -NTSTATUS ctdbd_persistent_store(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key, TDB_DATA data); -NTSTATUS ctdbd_start_persistent_update(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key, TDB_DATA data); -NTSTATUS ctdbd_cancel_persistent_update(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key, TDB_DATA data); - NTSTATUS ctdbd_control_local(struct ctdbd_connection *conn, uint32 opcode, uint64_t srvid, uint32_t flags, TDB_DATA data, TALLOC_CTX *mem_ctx, TDB_DATA *outdata, diff --git a/source3/include/dbwrap.h b/source3/include/dbwrap.h index ff7b8b6a74..8dba624de0 100644 --- a/source3/include/dbwrap.h +++ b/source3/include/dbwrap.h @@ -68,11 +68,6 @@ struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx, int hash_size, int tdb_flags, int open_flags, mode_t mode); -struct db_context *db_open_tdb2(TALLOC_CTX *mem_ctx, - const char *name, - int hash_size, int tdb_flags, - int open_flags, mode_t mode); - struct messaging_context; #ifdef CLUSTER_SUPPORT diff --git a/source3/include/proto.h b/source3/include/proto.h index 2c0f7687d9..d166813467 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -469,9 +469,6 @@ size_t pull_string_talloc_fn(TALLOC_CTX *ctx, size_t src_len, int flags); size_t align_string(const void *base_ptr, const char *p, int flags); -codepoint_t next_codepoint_ext(const char *str, charset_t src_charset, - size_t *bytes_consumed); -codepoint_t next_codepoint(const char *str, size_t *size); /* The following definitions come from lib/conn_tdb.c */ @@ -599,9 +596,6 @@ bool revoke_privilege_set(const struct dom_sid *sid, struct lsa_PrivilegeSet *se bool revoke_privilege_by_name(const struct dom_sid *sid, const char *name); NTSTATUS privilege_create_account(const struct dom_sid *sid ); NTSTATUS privilege_delete_account(const struct dom_sid *sid); -NTSTATUS privilege_set_init(PRIVILEGE_SET *priv_set); -NTSTATUS privilege_set_init_by_ctx(TALLOC_CTX *mem_ctx, PRIVILEGE_SET *priv_set); -void privilege_set_free(PRIVILEGE_SET *priv_set); bool is_privileged_sid( const struct dom_sid *sid ); bool grant_all_privileges( const struct dom_sid *sid ); @@ -939,9 +933,6 @@ void register_msg_pool_usage(struct messaging_context *msg_ctx); void push_dos_date(uint8_t *buf, int offset, time_t unixdate, int zone_offset); void push_dos_date2(uint8_t *buf,int offset,time_t unixdate, int zone_offset); void push_dos_date3(uint8_t *buf,int offset,time_t unixdate, int zone_offset); -time_t pull_dos_date(const uint8_t *date_ptr, int zone_offset); -time_t pull_dos_date2(const uint8_t *date_ptr, int zone_offset); -time_t pull_dos_date3(const uint8_t *date_ptr, int zone_offset); uint32_t convert_time_t_to_uint32_t(time_t t); time_t convert_uint32_t_to_time_t(uint32_t u); bool nt_time_is_zero(const NTTIME *nt); @@ -963,7 +954,6 @@ time_t make_unix_date3(const void *date_ptr, int zone_offset); time_t srv_make_unix_date(const void *date_ptr); time_t srv_make_unix_date2(const void *date_ptr); time_t srv_make_unix_date3(const void *date_ptr); -time_t convert_timespec_to_time_t(struct timespec ts); struct timespec convert_time_t_to_timespec(time_t t); struct timespec convert_timeval_to_timespec(const struct timeval tv); struct timeval convert_timespec_to_timeval(const struct timespec ts); @@ -1390,10 +1380,6 @@ char *strnrchr_m(const char *s, char c, unsigned int n); char *strstr_m(const char *src, const char *findstr); void strlower_m(char *s); void strupper_m(char *s); -size_t strlen_m_ext(const char *s, const charset_t src_charset, - const charset_t dst_charset); -size_t strlen_m_ext_term(const char *s, const charset_t src_charset, - const charset_t dst_charset); size_t strlen_m(const char *s); size_t strlen_m_term(const char *s); size_t strlen_m_term_null(const char *s); @@ -1656,7 +1642,6 @@ bool cli_state_seqnum_persistent(struct cli_state *cli, bool cli_state_seqnum_remove(struct cli_state *cli, uint16_t mid); bool cli_receive_smb(struct cli_state *cli); -bool cli_receive_smb_readX_header(struct cli_state *cli); bool cli_send_smb(struct cli_state *cli); bool cli_send_smb_direct_writeX(struct cli_state *cli, const char *p, @@ -2220,7 +2205,6 @@ NTSTATUS cli_pull(struct cli_state *cli, uint16_t fnum, void *priv, SMB_OFF_T *received); ssize_t cli_read(struct cli_state *cli, uint16_t fnum, char *buf, off_t offset, size_t size); -ssize_t cli_readraw(struct cli_state *cli, uint16_t fnum, char *buf, off_t offset, size_t size); ssize_t cli_write(struct cli_state *cli, uint16_t fnum, uint16 write_mode, const char *buf, off_t offset, size_t size); @@ -2357,7 +2341,6 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli, /* The following definitions come from libsmb/conncache.c */ -NTSTATUS check_negative_conn_cache_timeout( const char *domain, const char *server, unsigned int failed_cache_timeout ); NTSTATUS check_negative_conn_cache( const char *domain, const char *server); void add_failed_connection_entry(const char *domain, const char *server, NTSTATUS result) ; void flush_negative_conn_cache_for_domain(const char *domain); @@ -2385,7 +2368,6 @@ NTSTATUS map_nt_error_from_gss(uint32 gss_maj, uint32 minor); /* The following definitions come from libsmb/namecache.c */ -bool namecache_enable(void); bool namecache_store(const char *name, int name_type, int num_names, @@ -2530,7 +2512,6 @@ void ntlmssp_want_feature_list(struct ntlmssp_state *ntlmssp_state, char *featur void ntlmssp_want_feature(struct ntlmssp_state *ntlmssp_state, uint32_t feature); NTSTATUS ntlmssp_update(struct ntlmssp_state *ntlmssp_state, const DATA_BLOB in, DATA_BLOB *out) ; -DATA_BLOB ntlmssp_weaken_keys(struct ntlmssp_state *ntlmssp_state, TALLOC_CTX *mem_ctx); NTSTATUS ntlmssp_server_start(TALLOC_CTX *mem_ctx, bool is_standalone, const char *netbios_name, @@ -3693,7 +3674,6 @@ NTSTATUS pdb_wbc_sam_init(void); /* The following definitions come from passdb/pdb_tdb.c */ -bool init_sam_from_buffer_v2(struct samu *sampass, uint8_t *buf, uint32_t buflen); NTSTATUS pdb_tdbsam_init(void); /* The following definitions come from passdb/util_builtin.c */ @@ -4662,7 +4642,6 @@ void reply_open_pipe_and_X(connection_struct *conn, struct smb_request *req); void reply_pipe_write(struct smb_request *req); void reply_pipe_write_and_X(struct smb_request *req); void reply_pipe_read_and_X(struct smb_request *req); -void reply_pipe_close(connection_struct *conn, struct smb_request *req); /* The following definitions come from smbd/posix_acls.c */ diff --git a/source3/libads/ads_ldap_protos.h b/source3/libads/ads_ldap_protos.h index d7f93b737f..03869fe5c9 100644 --- a/source3/libads/ads_ldap_protos.h +++ b/source3/libads/ads_ldap_protos.h @@ -4,7 +4,6 @@ void ads_msgfree(ADS_STRUCT *ads, LDAPMessage *msg); char *ads_get_dn(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, LDAPMessage *msg); -char *ads_get_dn_canonical(ADS_STRUCT *ads, LDAPMessage *msg); char *ads_pull_string(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, LDAPMessage *msg, const char *field); diff --git a/source3/torture/proto.h b/source3/torture/proto.h index c7a4cbcfec..f27a253f2d 100644 --- a/source3/torture/proto.h +++ b/source3/torture/proto.h @@ -64,7 +64,6 @@ bool torture_nttrans_scan(int dummy); void *shm_setup(int size); bool smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx, char **hostname, char **sharename); -void torture_open_connection_free_unclist(char **unc_list); bool torture_open_connection(struct cli_state **c, int conn_index); bool torture_cli_session_setup2(struct cli_state *cli, uint16 *new_vuid); bool torture_close_connection(struct cli_state *c); diff --git a/source3/winbindd/idmap_adex/idmap_adex.h b/source3/winbindd/idmap_adex/idmap_adex.h index 61befeb8d2..18edf2fad9 100644 --- a/source3/winbindd/idmap_adex/idmap_adex.h +++ b/source3/winbindd/idmap_adex/idmap_adex.h @@ -157,8 +157,6 @@ NTSTATUS get_sid_type(ADS_STRUCT *ads, NTSTATUS cell_locate_membership(ADS_STRUCT * ads); NTSTATUS cell_lookup_settings(struct likewise_cell * cell); -NTSTATUS cell_follow_links(struct likewise_cell *cell); -NTSTATUS cell_set_local_provider(void); /* likewise_cell.c */ diff --git a/source3/winbindd/idmap_proto.h b/source3/winbindd/idmap_proto.h index efe7ac6027..fa7f712024 100644 --- a/source3/winbindd/idmap_proto.h +++ b/source3/winbindd/idmap_proto.h @@ -5,7 +5,6 @@ bool idmap_is_online(void); NTSTATUS smb_register_idmap(int version, const char *name, struct idmap_methods *methods); void idmap_close(void); -NTSTATUS idmap_init_cache(void); NTSTATUS idmap_allocate_uid(struct unixid *id); NTSTATUS idmap_allocate_gid(struct unixid *id); NTSTATUS idmap_backends_unixid_to_sid(const char *domname, |