r20269: merge -r20264:20267 from SAMBA_3_0_24

more no previous prototype warnings
(This used to be commit 41be182f78762372ae13759ede5d2bd40a71d7f5)

diff --git a/source3/lib/ldb/common/ldb_msg.c b/source3/lib/ldb/common/ldb_msg.c
index 65d1ecacb7a98ee502a5e94ccd99587371af9bfd..bf217d2787f3f38292da1149e1584a1543a31153 100644 (file)
--- 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 26f88769e6936ed5b4dc04496df698f5d5960368..5c5709f929efed12b597e4cda1bc78ae901224b9 100644 (file)
--- 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 632e22762f563c390d1fbddfad487a1c1eb54524..c90885bfab89bbf670a9a91b88f6570a8fa4f943 100644 (file)
--- 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 232195dfcd489e28f4100c65ef6c7bf0010dd5cc..34daba69bfcf89c2bfe59565d1ab8f735297f337 100644 (file)
--- 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 c4b1ecf26b35d2e3021d5f9e29c6cd8e037e93ff..02d15fe8a6fc20c46dad2b29ae460e1bd0764a03 100644 (file)
--- 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 aee60804372c9a21237077727d1b5be9976a2df5..e85142af906ec0aa7da09e1b1e6546b2ce135a8e 100644 (file)
--- 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 9f61b421298d1db4c5583765cf40bce143d4a66c..3d3034df15c51693b9c1830746cb5c7326be6dfe 100644 (file)
--- 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 a43febb0d6112eb696cde3349e5e170ccc522a5c..f586c29d84e8a767e665664f2c5b4d1d626b8c28 100644 (file)
--- 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 adaf89d0feb169eb1526576f0d24ae4c1d05fb1e..0d7bbb8f925af78811e7f137928145e3ffcb91f8 100644 (file)
--- 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 36e604f90ffac8b199ab520dd5abbc8ae7bdadbc..b9eb5a40e9373cd301ca2fdc21921ed186ded2a8 100644 (file)
--- 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 8c4fd7c89f72e96764dc1a9a880a81ba245805f8..fdde7acaf869380912ac4f6138f8e3be8a7a32e8 100644 (file)
--- 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 c7f17d3d0135dcdc1848f721da222f751686607c..0f0e0b834f89aa8894c55bc464cc1f7df92bb7e1 100644 (file)
--- 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 54477c452440b1d58cb2e873f50160156b6ab2c5..b62240ce508b3dbc9104d820591813e807ef2b27 100644 (file)
--- 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 19ee72f9e42990e3693438c546f6211da5806b50..f904dd1a599984b2d5c269dee8638f5a3f89a0ce 100644 (file)
--- 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 5c24382c1dfb43bab526d380cb6acbe515cd736f..13980cfab0383743b085f24cc2d0eccd1be74812 100644 (file)
--- 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 2cc7edb4c7b97edfe7519da970fcf9b892a6d14a..697bc15f97a58c5d15d492aa44b5a71024897292 100644 (file)
--- 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 d34bc2153a14bf29e6960873dd9ca5d1ddf00cd2..b26b13567743311f79c4ca800bdde48779c116bc 100644 (file)
--- 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 5ee2f8ab7d0ff27c7d5521ed4bc0654315128555..4cde73304415b53f70410f2c0180110b8da00f01 100644 (file)
--- 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 1bd75cf8b186c2489f40ecc91d214173d384e058..0eb30ee455289d679b6ee0bcc2847f72b51bc4e7 100644 (file)
--- 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 6911bdcd3bfff8bd8642d5077f91eaad05647f73..519be6019927d51cba58166a5e0683444d554dba 100644 (file)
--- 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 1e7b74b8d9cdb8aed2a3b863de24fa3f3159026f..20b20384a2655b6b6a3c1e4b2754db4949633b87 100644 (file)
--- 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 a7ce5e3f618934e730a0e8a4d3852001877e14f7..5a62f93f3d70d9517d914ac422b47cbed542042f 100644 (file)
--- 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;