svn commit: samba r20269 - in branches/SAMBA_3_0/source:
lib/ldb/common lib/ldb/ldb_tdb lib/ldb/modules libmsrpc
libsmb nsswitch printing registry rpc_parse rpc_server script
tdb/common
herb at samba.org
herb at samba.org
Wed Dec 20 01:10:07 GMT 2006
Author: herb
Date: 2006-12-20 01:10:04 +0000 (Wed, 20 Dec 2006)
New Revision: 20269
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20269
Log:
merge -r20264:20267 from SAMBA_3_0_24
more no previous prototype warnings
Modified:
branches/SAMBA_3_0/source/lib/ldb/common/ldb_msg.c
branches/SAMBA_3_0/source/lib/ldb/common/ldb_parse.c
branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_cache.c
branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
branches/SAMBA_3_0/source/lib/ldb/modules/paged_results.c
branches/SAMBA_3_0/source/libmsrpc/cac_samr.c
branches/SAMBA_3_0/source/libmsrpc/cac_svcctl.c
branches/SAMBA_3_0/source/libmsrpc/cac_winreg.c
branches/SAMBA_3_0/source/libmsrpc/libmsrpc.c
branches/SAMBA_3_0/source/libmsrpc/libmsrpc_internal.c
branches/SAMBA_3_0/source/libsmb/libsmb_cache.c
branches/SAMBA_3_0/source/libsmb/libsmbclient.c
branches/SAMBA_3_0/source/libsmb/smb_share_modes.c
branches/SAMBA_3_0/source/nsswitch/wb_common.c
branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c
branches/SAMBA_3_0/source/nsswitch/wins.c
branches/SAMBA_3_0/source/printing/print_test.c
branches/SAMBA_3_0/source/registry/reg_perfcount.c
branches/SAMBA_3_0/source/rpc_parse/parse_net.c
branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c
branches/SAMBA_3_0/source/script/mkbuildoptions.awk
branches/SAMBA_3_0/source/tdb/common/transaction.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/ldb/common/ldb_msg.c
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/common/ldb_msg.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/common/ldb_msg.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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)
*/
Modified: branches/SAMBA_3_0/source/lib/ldb/common/ldb_parse.c
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/common/ldb_parse.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/common/ldb_parse.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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> ')'
Modified: branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_cache.c
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_cache.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_cache.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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;
Modified: branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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
Modified: branches/SAMBA_3_0/source/lib/ldb/modules/paged_results.c
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/modules/paged_results.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/modules/paged_results.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -75,6 +75,8 @@
};
+int store_destructor(struct results_store *store);
+
int store_destructor(struct results_store *store)
{
if (store->prev) {
Modified: branches/SAMBA_3_0/source/libmsrpc/cac_samr.c
===================================================================
--- branches/SAMBA_3_0/source/libmsrpc/cac_samr.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/libmsrpc/cac_samr.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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 )
{
Modified: branches/SAMBA_3_0/source/libmsrpc/cac_svcctl.c
===================================================================
--- branches/SAMBA_3_0/source/libmsrpc/cac_svcctl.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/libmsrpc/cac_svcctl.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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 )
{
Modified: branches/SAMBA_3_0/source/libmsrpc/cac_winreg.c
===================================================================
--- branches/SAMBA_3_0/source/libmsrpc/cac_winreg.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/libmsrpc/cac_winreg.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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 )
Modified: branches/SAMBA_3_0/source/libmsrpc/libmsrpc.c
===================================================================
--- branches/SAMBA_3_0/source/libmsrpc/libmsrpc.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/libmsrpc/libmsrpc.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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 )
{
Modified: branches/SAMBA_3_0/source/libmsrpc/libmsrpc_internal.c
===================================================================
--- branches/SAMBA_3_0/source/libmsrpc/libmsrpc_internal.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/libmsrpc/libmsrpc_internal.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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 )
{
Modified: branches/SAMBA_3_0/source/libsmb/libsmb_cache.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmb_cache.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/libsmb/libsmb_cache.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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.
Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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)
Modified: branches/SAMBA_3_0/source/libsmb/smb_share_modes.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/smb_share_modes.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/libsmb/smb_share_modes.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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);
Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/wb_common.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/nsswitch/wb_common.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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 @@
/* Initialise a response structure */
-void init_response(struct winbindd_response *response)
+static void init_response(struct winbindd_response *response)
{
/* Initialise return value */
Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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;
Modified: branches/SAMBA_3_0/source/nsswitch/wins.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/wins.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/nsswitch/wins.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -34,6 +34,11 @@
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)
Modified: branches/SAMBA_3_0/source/printing/print_test.c
===================================================================
--- branches/SAMBA_3_0/source/printing/print_test.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/printing/print_test.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -77,5 +77,6 @@
#else
/* this keeps fussy compilers happy */
+ void print_test_dummy(void);
void print_test_dummy(void) {}
#endif /* DEVELOPER||ENABLE_BUILD_FARM_HACKS */
Modified: branches/SAMBA_3_0/source/registry/reg_perfcount.c
===================================================================
--- branches/SAMBA_3_0/source/registry/reg_perfcount.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/registry/reg_perfcount.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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);
+
/*********************************************************************
*********************************************************************/
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_net.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_net.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_net.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -1606,7 +1606,7 @@
/* "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 dump_user_flgs(uint32 user_flags) {
+static void dump_user_flgs(uint32 user_flags) {
int lvl = 10;
DEBUG(lvl,("dump_user_flgs\n"));
Modified: branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -281,7 +281,7 @@
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;
Modified: branches/SAMBA_3_0/source/script/mkbuildoptions.awk
===================================================================
--- branches/SAMBA_3_0/source/script/mkbuildoptions.awk 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/script/mkbuildoptions.awk 2006-12-20 01:10:04 UTC (rev 20269)
@@ -25,6 +25,7 @@
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 "/****************************************************************************";
Modified: branches/SAMBA_3_0/source/tdb/common/transaction.c
===================================================================
--- branches/SAMBA_3_0/source/tdb/common/transaction.c 2006-12-20 01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/tdb/common/transaction.c 2006-12-20 01:10:04 UTC (rev 20269)
@@ -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;
More information about the samba-cvs
mailing list