Several compiler warning fixes + fix dependencies samtest

(This used to be commit b813761126249c3c0c0e38d2a3306d1d0c33c4eb)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 58e38578980f99f019ed80f647f35c52fd90a23b..c132fe8221d476048fc4a4f49cbbb8fd20385141 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -222,7 +222,7 @@ SAM_STATIC_MODULES = sam/sam_plugin.o
 SAM_OBJ = sam/account.o sam/get_set_account.o sam/get_set_group.o \
                sam/get_set_domain.o sam/interface.o sam/api.o $(SAM_STATIC_MODULES)
 
-SAMTEST_OBJ = torture/samtest.o $(SAM_OBJ) $(LIB_OBJ) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) $(READLINE_OBJ)
+SAMTEST_OBJ = torture/samtest.o $(SAM_OBJ) $(LIB_OBJ) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(READLINE_OBJ) lib/util_seaccess.o
 
 GROUPDB_OBJ = groupdb/mapping.o
 

diff --git a/source3/sam/sam_plugin.c b/source3/sam/sam_plugin.c
index 56f826054478042aefb2bb04e6a892fdc2f844e9..c32acf3d3cb361a7f377b1fcb3b2c63b6a2c85e0 100644 (file)
--- a/source3/sam/sam_plugin.c
+++ b/source3/sam/sam_plugin.c
@@ -25,7 +25,7 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_SAM
 
-NTSTATUS sam_init_plugin(SAM_CONTEXT *sam_context, SAM_METHODS **sam_method, const char *location)
+NTSTATUS sam_init_plugin(const SAM_CONTEXT *sam_context, SAM_METHODS **sam_method, const char *location)
 {
        void * dl_handle;
        char *plugin_location, *plugin_name, *p;