From f737d7e04886707153e3d44130bfa9efd22a879d Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 27 Sep 2009 10:55:03 +0200 Subject: [PATCH] Fix Win32 build --- bacula/src/lib/priv.c | 2 ++ bacula/src/win32/cats/bacula_cats.def | 2 +- bacula/src/win32/lib/Makefile | 1 + bacula/src/win32/lib/bacula32.def | 6 ++++-- bacula/src/win32/lib/bacula64.def | 4 +++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bacula/src/lib/priv.c b/bacula/src/lib/priv.c index 0e9267eb06..01ae7ac276 100644 --- a/bacula/src/lib/priv.c +++ b/bacula/src/lib/priv.c @@ -48,6 +48,7 @@ extern "C" int initgroups(const char *,int); */ void drop(char *uname, char *gname, bool keep_readall_caps) { +#if defined(HAVE_PWD_H) && defined(HAVE_GRP_H) struct passwd *passw = NULL; struct group *group = NULL; gid_t gid; @@ -131,4 +132,5 @@ void drop(char *uname, char *gname, bool keep_readall_caps) berrno be; Emsg1(M_ERROR_TERM, 0, _("Could not set specified userid: %s\n"), username); } +#endif } diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def index 7c82051e6e..16e77aece7 100644 --- a/bacula/src/win32/cats/bacula_cats.def +++ b/bacula/src/win32/cats/bacula_cats.def @@ -5,7 +5,7 @@ EXPORTS _Z15bvfs_parent_dirPc _Z17bvfs_basename_dirPc _Z17bvfs_update_cacheP3JCRP4B_DB -_Z32bvfs_update_path_hierarchy_cacheP3JCRP4B_DBP11db_list_ctx +_Z32bvfs_update_path_hierarchy_cacheP3JCRP4B_DBPc _ZN4Bvfs12_handle_pathEPviPPc _ZN4Bvfs12update_cacheEv _ZN4Bvfs15ls_special_dirsEv diff --git a/bacula/src/win32/lib/Makefile b/bacula/src/win32/lib/Makefile index 7fb9412d8a..619dc50ca5 100644 --- a/bacula/src/win32/lib/Makefile +++ b/bacula/src/win32/lib/Makefile @@ -76,6 +76,7 @@ LIB_OBJS = \ $(OBJDIR)/message.o \ $(OBJDIR)/openssl.o \ $(OBJDIR)/plugins.o \ + $(OBJDIR)/priv.o \ $(OBJDIR)/pythonlib.o \ $(OBJDIR)/queue.o \ $(OBJDIR)/rblist.o \ diff --git a/bacula/src/win32/lib/bacula32.def b/bacula/src/win32/lib/bacula32.def index 8583d399a4..acfc3cdb39 100644 --- a/bacula/src/win32/lib/bacula32.def +++ b/bacula/src/win32/lib/bacula32.def @@ -320,7 +320,6 @@ _Z15escape_filenamePKc _Z15read_state_filePcPKci _Z16write_state_filePcPKci _Z20make_unique_filenamePPciS_ -_Z4dropPcS_ _Z5bfreePv _Z6bfgetsPciP6_iobuf _Z7bcallocjj @@ -594,7 +593,10 @@ _Z8term_msgv _Z9close_msgP3JCR _Z9get_tracev _Z9set_tracei - + +; priv.o +_Z4dropPcS_b + ; pythonlib.o _Z21generate_daemon_eventP3JCRPKc diff --git a/bacula/src/win32/lib/bacula64.def b/bacula/src/win32/lib/bacula64.def index 59ae8e7235..4ea6c31ac3 100644 --- a/bacula/src/win32/lib/bacula64.def +++ b/bacula/src/win32/lib/bacula64.def @@ -314,7 +314,6 @@ _Z15escape_filenamePKc _Z15read_state_filePcPKci _Z16write_state_filePcPKci _Z20make_unique_filenamePPciS_ -_Z4dropPcS_ _Z5bfreePv _Z6bfgetsPciP6_iobuf _Z7bcallocyy @@ -588,6 +587,9 @@ _Z9close_msgP3JCR _Z9get_tracev _Z9set_tracei +; priv.o +_Z4dropPcS_b + ; pythonlib.o _Z21generate_daemon_eventP3JCRPKc -- 2.39.5