Fix Win32 build

diff --git a/bacula/src/lib/priv.c b/bacula/src/lib/priv.c
index 0e9267eb0649fb3da4e507fb673b5ecbee16cd26..01ae7ac276cfb1b81e0bcf492169a6e0234d4b90 100644 (file)
--- 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 7c82051e6e06eb794e7f6b9128f365db027dde54..16e77aece7024af717bc67064b9ba3c4f58b214f 100644 (file)
--- 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 7fb9412d8ab6423bb1604dd43f3b0eec5bd4b44f..619dc50ca5facf5cec52bdd085bfd3274b677779 100644 (file)
--- 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 8583d399a4025f66a0765a00b22fb74f6f017b5e..acfc3cdb3977cde92ddbddc3870813bc1331414e 100644 (file)
--- 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 59ae8e72357eba7b11a7c75eaabafefa520dc622..4ea6c31ac3333289710606a4a97e68026eb6801a 100644 (file)
--- 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