From: Kern Sibbald Date: Wed, 16 Jun 2010 18:19:52 +0000 (+0200) Subject: Fix Makefile and build problems X-Git-Tag: Release-5.2.1~1297 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c852d4c64d8f69f3ace272f50d63a73f62104957;p=bacula%2Fbacula Fix Makefile and build problems --- diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in index a607e5f5f1..e4c86a9367 100644 --- a/bacula/src/cats/Makefile.in +++ b/bacula/src/cats/Makefile.in @@ -29,7 +29,7 @@ INCLUDE_FILES = cats.h protos.h sql_cmds.h LIBBACSQL_SRCS = mysql.c dbi.c \ sql.c sql_cmds.c sql_create.c sql_delete.c sql_find.c \ sql_get.c sql_list.c sql_update.c sqlite.c \ - postgresql.c ingres.c myingres.c \ + postgresql.c \ bvfs.c LIBBACSQL_OBJS = $(LIBBACSQL_SRCS:.c=.o) LIBBACSQL_LOBJS = $(LIBBACSQL_SRCS:.c=.lo) diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c index c26a4157e0..a7c0b65af9 100644 --- a/bacula/src/filed/acl.c +++ b/bacula/src/filed/acl.c @@ -1248,77 +1248,7 @@ static bacl_exit_code (*os_parse_acl_streams)(JCR *jcr, int stream) = solaris_pa #endif /* HAVE_SUN_OS */ #endif /* HAVE_ACL */ -#if defined(HAVE_AFS_ACL) - -#include -#include -#include -#include -#include - -/** - * External references to functions in the libsys library function not in current include files. - */ -extern "C" { -long pioctl(char *pathp, long opcode, struct ViceIoctl *blobp, int follow); -} - -static bacl_exit_code afs_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt) -{ - int error; - struct ViceIoctl vip; - char acl_text[BUFSIZ]; - berrno be; - - /** - * AFS ACLs can only be set on a directory, so no need to try to - * request them for anything other then that. - */ - if (ff_pkt->type != FT_DIREND) { - return bacl_exit_ok; - } - - vip.in = NULL; - vip.in_size = 0; - vip.out = acl_text; - vip.out_size = sizeof(acl_text); - memset((caddr_t)acl_text, 0, sizeof(acl_text)); - - if ((error = pioctl(jcr->last_fname, VIOCGETAL, &vip, 0)) < 0) { - Mmsg2(jcr->errmsg, _("pioctl VIOCGETAL error on file \"%s\": ERR=%s\n"), - jcr->last_fname, be.bstrerror()); - Dmsg2(100, "pioctl VIOCGETAL error file=%s ERR=%s\n", - jcr->last_fname, be.bstrerror()); - return bacl_exit_error; - } - jcr->acl_data->content_length = pm_strcpy(jcr->acl_data->content, acl_text); - return send_acl_stream(jcr, STREAM_ACL_AFS_TEXT); -} - -static bacl_exit_code afs_parse_acl_stream(JCR *jcr, int stream) -{ - int error; - struct ViceIoctl vip; - berrno be; - - vip.in = jcr->acl_data->content; - vip.in_size = jcr->acl_data->content_length; - vip.out = NULL; - vip.out_size = 0; - - if ((error = pioctl(jcr->last_fname, VIOCSETAL, &vip, 0)) < 0) { - Mmsg2(jcr->errmsg, _("pioctl VIOCSETAL error on file \"%s\": ERR=%s\n"), - jcr->last_fname, be.bstrerror()); - Dmsg2(100, "pioctl VIOCSETAL error file=%s ERR=%s\n", - jcr->last_fname, be.bstrerror()); - - return bacl_exit_error; - } - return bacl_exit_ok; -} -#endif /* HAVE_AFS_ACL */ - -/** +/* * Entry points when compiled with support for ACLs on a supported platform. */ @@ -1339,19 +1269,7 @@ bacl_exit_code build_acl_streams(JCR *jcr, FF_PKT *ff_pkt) */ jcr->acl_data->flags = 0; -#if defined(HAVE_AFS_ACL) - /** - * AFS is a non OS specific filesystem so see if this path is on an AFS filesystem - * Set the BACL_FLAG_SAVE_AFS flag if it is. If not set the BACL_FLAG_SAVE_NATIVE flag. - */ - if (fstype_equals(jcr->last_fname, "afs")) { - jcr->acl_data->flags |= BACL_FLAG_SAVE_AFS; - } else { - jcr->acl_data->flags |= BACL_FLAG_SAVE_NATIVE; - } -#else jcr->acl_data->flags |= BACL_FLAG_SAVE_NATIVE; -#endif /** * Save that we started scanning a new filesystem. @@ -1359,15 +1277,6 @@ bacl_exit_code build_acl_streams(JCR *jcr, FF_PKT *ff_pkt) jcr->acl_data->current_dev = ff_pkt->statp.st_dev; } -#if defined(HAVE_AFS_ACL) - /** - * See if the BACL_FLAG_SAVE_AFS flag is set which lets us know if we should - * save AFS ACLs. - */ - if (jcr->acl_data->flags & BACL_FLAG_SAVE_AFS) { - return afs_build_acl_streams(jcr, ff_pkt); - } -#endif #if defined(HAVE_ACL) /** * See if the BACL_FLAG_SAVE_NATIVE flag is set which lets us know if we should @@ -1392,10 +1301,6 @@ bacl_exit_code parse_acl_streams(JCR *jcr, int stream) unsigned int cnt; switch (stream) { -#if defined(HAVE_AFS_ACL) - case STREAM_ACL_AFS_TEXT: - return afs_parse_acl_stream(jcr, stream); -#endif #if defined(HAVE_ACL) case STREAM_UNIX_ACCESS_ACL: case STREAM_UNIX_DEFAULT_ACL: diff --git a/bacula/src/win32/filed/plugins/Makefile b/bacula/src/win32/filed/plugins/Makefile index 331effdaeb..458059233d 100644 --- a/bacula/src/win32/filed/plugins/Makefile +++ b/bacula/src/win32/filed/plugins/Makefile @@ -44,28 +44,6 @@ EXCHANGE_OBJS = \ $(OBJDIR)/dbi_node.o \ $(OBJDIR)/file_node.o -VSS_BASE_OBJS = \ - $(OBJDIR)/vss_plugin_wrapper.o \ - $(OBJDIR)/vss_base.o \ - $(OBJDIR)/vss_node.o \ - $(OBJDIR)/vss_root_node.o \ - $(OBJDIR)/vss_writer_node.o \ - $(OBJDIR)/vss_component_node.o \ - $(OBJDIR)/vss_file_node.o \ - $(OBJDIR)/find_filespec.o - -SYSTEMSTATE_OBJS = \ - $(VSS_BASE_OBJS) \ - $(OBJDIR)/systemstate-fd.o \ - $(OBJDIR)/systemstate_registry.o \ - $(OBJDIR)/systemstate_frs.o \ - $(OBJDIR)/systemstate_dfsr.o \ - $(OBJDIR)/systemstate_complusregdb.o - -SHAREPOINT_OBJS = \ - $(VSS_BASE_OBJS) \ - $(OBJDIR)/sharepoint-fd.o - BPIPE_OBJS = \ $(OBJDIR)/bpipe-fd.o @@ -85,19 +63,13 @@ LIBS_DLL = \ .PHONY: all clean -all: $(BINDIR)/exchange-fd.dll $(BINDIR)/systemstate-fd.dll $(BINDIR)/sharepoint-fd.dll $(BINDIR)/bpipe-fd.dll +all: $(BINDIR)/exchange-fd.dll $(BINDIR)/bpipe-fd.dll clean: @echo "Cleaning `pwd`" $(call clean_obj,$(EXCHANGE_OBJS)) $(call clean_exe,$(BINDIR)/exchange-fd.dll) $(ECHO_CMD)rm -f $(OBJDIR)/exchange-fd.a $(LIBDIR)/libexchange-fd.a - $(call clean_obj,$(SYSTEMSTATE_OBJS)) - $(call clean_exe,$(BINDIR)/systemstate-fd.dll) - $(ECHO_CMD)rm -f $(OBJDIR)/systemstate-fd.a $(LIBDIR)/libsystemstate-fd.a - $(call clean_obj,$(SHAREPOINT_OBJS)) - $(call clean_exe,$(BINDIR)/sharepoint-fd.dll) - $(ECHO_CMD)rm -f $(OBJDIR)/sharepoint-fd.a $(LIBDIR)/libsharepoint-fd.a $(ECHO_CMD)rm -rf $(OBJDIRS) # @@ -119,20 +91,6 @@ $(BINDIR)/exchange-fd.dll: $(EXCHANGE_OBJS) exchange-fd.def $(call checkdir,$@) $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/exchange-fd.a $^ $(LIBS_DLL) -o $@ -$(BINDIR)/systemstate-fd.dll: DLL_DEFINE=BUILDING_DLL - -$(BINDIR)/systemstate-fd.dll: $(SYSTEMSTATE_OBJS) systemstate-fd.def $(LIBS_BACULA) - @echo "Linking $@" - $(call checkdir,$@) - $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/systemstate-fd.a $^ $(LIBS_DLL) -o $@ - -$(BINDIR)/sharepoint-fd.dll: DLL_DEFINE=BUILDING_DLL - -$(BINDIR)/sharepoint-fd.dll: $(SHAREPOINT_OBJS) sharepoint-fd.def $(LIBS_BACULA) - @echo "Linking $@" - $(call checkdir,$@) - $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/sharepoint-fd.a $^ $(LIBS_DLL) -o $@ - $(BINDIR)/bpipe-fd.dll: DLL_DEFINE=BUILDING_DLL $(BINDIR)/bpipe-fd.dll: $(BPIPE_OBJS) bpipe-fd.def $(LIBS_BACULA)