[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bacula-commits
Subject:    [Bacula-commits] git: Bacula branch, master,
From:       "Kern Sibbald" <kerns () users ! sourceforge ! net>
Date:       2009-09-27 8:54:46
Message-ID: E1MrpWq-0003OK-EE () cj8yhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula".

The branch, master has been updated
       via  f737d7e04886707153e3d44130bfa9efd22a879d (commit)
       via  0d3ddc5a870209d75644c0b9be7315c998df1fd6 (commit)
      from  dc787dcd1976787af4792712b9d598bcecc7c5a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f737d7e04886707153e3d44130bfa9efd22a879d
Author: Kern Sibbald <kern@sibbald.com>
Date:   Sun Sep 27 10:55:03 2009 +0200

    Fix Win32 build

commit 0d3ddc5a870209d75644c0b9be7315c998df1fd6
Author: Kern Sibbald <kern@sibbald.com>
Date:   Sun Sep 27 10:54:23 2009 +0200

    Fix compiler warning

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index 6801467..1a65e43 100644
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -1084,7 +1084,7 @@ bool decompress_data(JCR *jcr, char **data, uint32_t *length)
       /*
        * The buffer size is too small, try with a bigger one
        */
-      compress_len = jcr->compress_buf_size = jcr->compress_buf_size + jcr->compress_buf_size >> 1;
+      compress_len = jcr->compress_buf_size = jcr->compress_buf_size + (jcr->compress_buf_size >> 1);
       Dmsg2(200, "Comp_len=%d msglen=%d\n", compress_len, *length);
       jcr->compress_buf = check_pool_memory_size(jcr->compress_buf,
                                                  compress_len);
diff --git a/bacula/src/lib/priv.c b/bacula/src/lib/priv.c
index 0e9267e..01ae7ac 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 7c82051..16e77ae 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 7fb9412..619dc50 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 8583d39..acfc3cd 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 59ae8e7..4ea6c31 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
  


hooks/post-receive
-- 
Bacula

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]