summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2006-12-20 01:10:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:38 -0500
commite59e787b4868acffad49b6264e319d585643d5ab (patch)
treeedf25bdd2abeec965f640b130bb6f40369d4ddb7
parent84cd4d05e0a6e04c2a9fd1f4608a73ee1086a7af (diff)
downloadsamba-e59e787b4868acffad49b6264e319d585643d5ab.tar.gz
samba-e59e787b4868acffad49b6264e319d585643d5ab.tar.bz2
samba-e59e787b4868acffad49b6264e319d585643d5ab.zip
r20269: merge -r20264:20267 from SAMBA_3_0_24
more no previous prototype warnings (This used to be commit 41be182f78762372ae13759ede5d2bd40a71d7f5)
-rw-r--r--source3/lib/ldb/common/ldb_msg.c4
-rw-r--r--source3/lib/ldb/common/ldb_parse.c2
-rw-r--r--source3/lib/ldb/ldb_tdb/ldb_cache.c2
-rw-r--r--source3/lib/ldb/ldb_tdb/ldb_tdb.c1
-rw-r--r--source3/lib/ldb/modules/paged_results.c2
-rw-r--r--source3/libmsrpc/cac_samr.c3
-rw-r--r--source3/libmsrpc/cac_svcctl.c4
-rw-r--r--source3/libmsrpc/cac_winreg.c2
-rw-r--r--source3/libmsrpc/libmsrpc.c2
-rw-r--r--source3/libmsrpc/libmsrpc_internal.c4
-rw-r--r--source3/libsmb/libsmb_cache.c3
-rw-r--r--source3/libsmb/libsmbclient.c3
-rw-r--r--source3/libsmb/smb_share_modes.c4
-rw-r--r--source3/nsswitch/wb_common.c6
-rw-r--r--source3/nsswitch/winbind_nss_linux.c35
-rw-r--r--source3/nsswitch/wins.c5
-rw-r--r--source3/printing/print_test.c1
-rw-r--r--source3/registry/reg_perfcount.c2
-rw-r--r--source3/rpc_parse/parse_net.c4
-rw-r--r--source3/rpc_server/srv_eventlog_nt.c2
-rw-r--r--source3/script/mkbuildoptions.awk1
-rw-r--r--source3/tdb/common/transaction.c3
22 files changed, 91 insertions, 4 deletions
diff --git a/source3/lib/ldb/common/ldb_msg.c b/source3/lib/ldb/common/ldb_msg.c
index 65d1ecacb7..bf217d2787 100644
--- a/source3/lib/ldb/common/ldb_msg.c
+++ b/source3/lib/ldb/common/ldb_msg.c
@@ -35,6 +35,10 @@
#include "includes.h"
#include "ldb/include/includes.h"
+void ldb_dump_results(struct ldb_context *ldb, struct ldb_result *result, FILE *f);
+int ldb_msg_element_compare_name(struct ldb_message_element *el1,
+ struct ldb_message_element *el2);
+
/*
create a new ldb_message in a given memory context (NULL for top level)
*/
diff --git a/source3/lib/ldb/common/ldb_parse.c b/source3/lib/ldb/common/ldb_parse.c
index 26f88769e6..5c5709f929 100644
--- a/source3/lib/ldb/common/ldb_parse.c
+++ b/source3/lib/ldb/common/ldb_parse.c
@@ -45,6 +45,8 @@
#include "ldb/include/includes.h"
#include "system/locale.h"
+struct ldb_val ldb_binary_decode(void *mem_ctx, const char *str);
+
/*
a filter is defined by:
<filter> ::= '(' <filtercomp> ')'
diff --git a/source3/lib/ldb/ldb_tdb/ldb_cache.c b/source3/lib/ldb/ldb_tdb/ldb_cache.c
index 632e22762f..c90885bfab 100644
--- a/source3/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/source3/lib/ldb/ldb_tdb/ldb_cache.c
@@ -42,6 +42,8 @@
#define LTDB_FLAG_HIDDEN (1<<2)
#define LTDB_FLAG_OBJECTCLASS (1<<3)
+int ltdb_attribute_flags(struct ldb_module *module, const char *attr_name);
+
/* valid attribute flags */
static const struct {
const char *name;
diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb.c b/source3/lib/ldb/ldb_tdb/ldb_tdb.c
index 232195dfcd..34daba69bf 100644
--- a/source3/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source3/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -47,6 +47,7 @@
#include "ldb/ldb_tdb/ldb_tdb.h"
+int ltdb_check_special_dn(struct ldb_module *module, const struct ldb_message *msg);
/*
map a tdb error code to a ldb error code
diff --git a/source3/lib/ldb/modules/paged_results.c b/source3/lib/ldb/modules/paged_results.c
index c4b1ecf26b..02d15fe8a6 100644
--- a/source3/lib/ldb/modules/paged_results.c
+++ b/source3/lib/ldb/modules/paged_results.c
@@ -75,6 +75,8 @@ struct private_data {
};
+int store_destructor(struct results_store *store);
+
int store_destructor(struct results_store *store)
{
if (store->prev) {
diff --git a/source3/libmsrpc/cac_samr.c b/source3/libmsrpc/cac_samr.c
index aee6080437..e85142af90 100644
--- a/source3/libmsrpc/cac_samr.c
+++ b/source3/libmsrpc/cac_samr.c
@@ -30,6 +30,9 @@
/*not sure what this is.. taken from rpcclient/cmd_samr.c*/
#define SAMR_LOOKUP_FLAGS 0x000003e8
+DOM_SID *cac_get_domain_sid( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
+ uint32 des_access );
+
int cac_SamConnect( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
struct SamConnect *op )
{
diff --git a/source3/libmsrpc/cac_svcctl.c b/source3/libmsrpc/cac_svcctl.c
index 9f61b42129..3d3034df15 100644
--- a/source3/libmsrpc/cac_svcctl.c
+++ b/source3/libmsrpc/cac_svcctl.c
@@ -24,6 +24,10 @@
#define WAIT_SLEEP_TIME 300000
+int cac_WaitForService( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
+ POLICY_HND * svc_hnd, uint32 state, uint32 timeout,
+ SERVICE_STATUS * status );
+
int cac_SvcOpenScm( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
struct SvcOpenScm *op )
{
diff --git a/source3/libmsrpc/cac_winreg.c b/source3/libmsrpc/cac_winreg.c
index a43febb0d6..f586c29d84 100644
--- a/source3/libmsrpc/cac_winreg.c
+++ b/source3/libmsrpc/cac_winreg.c
@@ -22,6 +22,8 @@
#include "libmsrpc.h"
#include "libmsrpc_internal.h"
+WERROR cac_delete_subkeys_recursive( struct rpc_pipe_client * pipe_hnd,
+ TALLOC_CTX * mem_ctx, POLICY_HND * key );
int cac_RegConnect( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
struct RegConnect *op )
diff --git a/source3/libmsrpc/libmsrpc.c b/source3/libmsrpc/libmsrpc.c
index adaf89d0fe..0d7bbb8f92 100644
--- a/source3/libmsrpc/libmsrpc.c
+++ b/source3/libmsrpc/libmsrpc.c
@@ -24,6 +24,8 @@
#include "libsmbclient.h"
#include "libsmb_internal.h"
+int cac_InitHandleData( CacServerHandle * hnd );
+
/*this function is based on code found in smbc_init_context() (libsmb/libsmbclient.c)*/
void cac_Init( int debug )
{
diff --git a/source3/libmsrpc/libmsrpc_internal.c b/source3/libmsrpc/libmsrpc_internal.c
index 36e604f90f..b9eb5a40e9 100644
--- a/source3/libmsrpc/libmsrpc_internal.c
+++ b/source3/libmsrpc/libmsrpc_internal.c
@@ -23,6 +23,10 @@
#include "libmsrpc.h"
#include "libmsrpc_internal.h"
+char *cac_unistr_to_str( TALLOC_CTX * mem_ctx, uint16 * src, int num_bytes );
+char *talloc_unistr2_to_ascii( TALLOC_CTX * mem_ctx, UNISTR2 str );
+char *cac_unistr_ascii( TALLOC_CTX * mem_ctx, UNISTR src );
+
/*used to get a struct rpc_pipe_client* to be passed into rpccli* calls*/
struct rpc_pipe_client *cac_GetPipe( CacServerHandle * hnd, int pi_idx )
{
diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c
index 8c4fd7c89f..fdde7acaf8 100644
--- a/source3/libsmb/libsmb_cache.c
+++ b/source3/libsmb/libsmb_cache.c
@@ -26,6 +26,9 @@
#include "include/libsmbclient.h"
#include "../include/libsmb_internal.h"
+
+int smbc_default_cache_functions(SMBCCTX * context);
+
/*
* Structure we use if internal caching mechanism is used
* nothing fancy here.
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index c7f17d3d01..0f0e0b834f 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -26,6 +26,9 @@
#include "include/libsmb_internal.h"
+struct smbc_dirent *smbc_readdir_ctx(SMBCCTX *context, SMBCFILE *dir);
+struct smbc_dir_list *smbc_check_dir_ent(struct smbc_dir_list *list,
+ struct smbc_dirent *dirent);
/*
* DOS Attribute values (used internally)
diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index 54477c4524..b62240ce50 100644
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -33,6 +33,10 @@
#undef malloc
#endif
+int smb_create_share_mode_entry_ex(struct smbdb_ctx *db_ctx, uint64_t dev,
+ uint64_t ino, const struct smb_share_mode_entry *new_entry,
+ const char *sharepath, const char *filename);
+
static BOOL sharemodes_procid_equal(const struct process_id *p1, const struct process_id *p2)
{
return (p1->pid == p2->pid);
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index 19ee72f9e4..f904dd1a59 100644
--- a/source3/nsswitch/wb_common.c
+++ b/source3/nsswitch/wb_common.c
@@ -26,6 +26,10 @@
#include "winbind_client.h"
+BOOL winbind_env_set( void );
+BOOL winbind_off( void );
+BOOL winbind_on( void );
+
/* Global variables. These are effectively the client state information */
int winbindd_fd = -1; /* fd for winbindd socket */
@@ -53,7 +57,7 @@ void init_request(struct winbindd_request *request, int request_type)
/* Initialise a response structure */
-void init_response(struct winbindd_response *response)
+static void init_response(struct winbindd_response *response)
{
/* Initialise return value */
diff --git a/source3/nsswitch/winbind_nss_linux.c b/source3/nsswitch/winbind_nss_linux.c
index 5c24382c1d..13980cfab0 100644
--- a/source3/nsswitch/winbind_nss_linux.c
+++ b/source3/nsswitch/winbind_nss_linux.c
@@ -30,6 +30,41 @@
#define MAX_GETPWENT_USERS 250
#define MAX_GETGRENT_USERS 250
+NSS_STATUS _nss_winbind_setpwent(void);
+NSS_STATUS _nss_winbind_endpwent(void);
+NSS_STATUS _nss_winbind_getpwent_r(struct passwd *result, char *buffer,
+ size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_getpwuid_r(uid_t uid, struct passwd *result,
+ char *buffer, size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_getpwnam_r(const char *name, struct passwd *result,
+ char *buffer, size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_setgrent(void);
+NSS_STATUS _nss_winbind_endgrent(void);
+NSS_STATUS _nss_winbind_getgrent_r(struct group *result, char *buffer,
+ size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_getgrlst_r(struct group *result, char *buffer,
+ size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_getgrnam_r(const char *name, struct group *result,
+ char *buffer, size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, struct group *result, char *buffer,
+ size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start,
+ long int *size, gid_t **groups,
+ long int limit, int *errnop);
+NSS_STATUS _nss_winbind_getusersids(const char *user_sid, char **group_sids,
+ int *num_groups, char *buffer, size_t buf_size,
+ int *errnop);
+NSS_STATUS _nss_winbind_nametosid(const char *name, char **sid, char *buffer,
+ size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_sidtoname(const char *sid, char **name, char *buffer,
+ size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_sidtouid(const char *sid, uid_t *uid, int *errnop);
+NSS_STATUS _nss_winbind_sidtogid(const char *sid, gid_t *gid, int *errnop);
+NSS_STATUS _nss_winbind_uidtosid(uid_t uid, char **sid, char *buffer,
+ size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_gidtosid(gid_t gid, char **sid, char *buffer,
+ size_t buflen, int *errnop);
+
/* Prototypes from wb_common.c */
extern int winbindd_fd;
diff --git a/source3/nsswitch/wins.c b/source3/nsswitch/wins.c
index 2cc7edb4c7..697bc15f97 100644
--- a/source3/nsswitch/wins.c
+++ b/source3/nsswitch/wins.c
@@ -34,6 +34,11 @@ static int initialised;
extern BOOL AllowDebugChange;
+NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, struct hostent *he,
+ char *buffer, size_t buflen, int *h_errnop);
+NSS_STATUS _nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he,
+ char *buffer, size_t buflen, int *h_errnop);
+
/* Use our own create socket code so we don't recurse.... */
static int wins_lookup_open_socket_in(void)
diff --git a/source3/printing/print_test.c b/source3/printing/print_test.c
index d34bc2153a..b26b135677 100644
--- a/source3/printing/print_test.c
+++ b/source3/printing/print_test.c
@@ -77,5 +77,6 @@ struct printif test_printif =
#else
/* this keeps fussy compilers happy */
+ void print_test_dummy(void);
void print_test_dummy(void) {}
#endif /* DEVELOPER||ENABLE_BUILD_FARM_HACKS */
diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index 5ee2f8ab7d..4cde733044 100644
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -31,6 +31,8 @@
#define NAMES_DB "names.tdb"
#define DATA_DB "data.tdb"
+PERF_OBJECT_TYPE *_reg_perfcount_find_obj(PERF_DATA_BLOCK *block, int objind);
+
/*********************************************************************
*********************************************************************/
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index 1bd75cf8b1..0eb30ee455 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -1606,7 +1606,7 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr,
/* "other" sids are set up above */
}
- void dump_acct_flags(uint32 acct_flags) {
+static void dump_acct_flags(uint32 acct_flags) {
int lvl = 10;
DEBUG(lvl,("dump_acct_flags\n"));
@@ -1633,7 +1633,7 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr,
}
}
- void dump_user_flgs(uint32 user_flags) {
+static void dump_user_flgs(uint32 user_flags) {
int lvl = 10;
DEBUG(lvl,("dump_user_flgs\n"));
diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c
index 6911bdcd3b..519be60199 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -281,7 +281,7 @@ static int elog_size( EVENTLOG_INFO *info )
Eventlog_entry. returns NULL if it can't get the record for some reason.
********************************************************************/
-Eventlog_entry *get_eventlog_record( prs_struct * ps, TDB_CONTEXT * tdb,
+static Eventlog_entry *get_eventlog_record( prs_struct * ps, TDB_CONTEXT * tdb,
int recno, Eventlog_entry * ee )
{
TDB_DATA ret, key;
diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
index 1e7b74b8d9..20b20384a2 100644
--- a/source3/script/mkbuildoptions.awk
+++ b/source3/script/mkbuildoptions.awk
@@ -25,6 +25,7 @@ BEGIN {
print "#include \"dynconfig.h\"";
print "";
print "static void output(BOOL screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);";
+ print "void build_options(BOOL screen);";
print "";
print "";
print "/****************************************************************************";
diff --git a/source3/tdb/common/transaction.c b/source3/tdb/common/transaction.c
index a7ce5e3f61..5a62f93f3d 100644
--- a/source3/tdb/common/transaction.c
+++ b/source3/tdb/common/transaction.c
@@ -88,6 +88,9 @@
*/
+int transaction_brlock(struct tdb_context *tdb, tdb_off_t offset,
+ int rw_type, int lck_type, int probe, size_t len);
+
struct tdb_transaction_el {
struct tdb_transaction_el *next, *prev;
tdb_off_t offset;