Additional Solaris fix + bdb.c fix

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@372 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 9d026cf6693491cb58140571703d4849f9f86f75..5f18bdc97741c336b3e869b9817d86e58e652556 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1307,7 +1307,7 @@ solaris)
            platforms/solaris/bacula-fd \
            platforms/solaris/bacula-sd \
            platforms/solaris/bacula-dir"
-       if test x$DISTVER = x2.6 ; then
+       if test x$DISTVER = x5.6 ; then
            AC_DEFINE(HAVE_OLD_SOCKOPT)
        fi
   ;;

diff --git a/bacula/configure b/bacula/configure
index e85591bdc00173d60bdac8912db06de798b13e5e..69ad6f6533af7b9339fe80920c6dde0aae8fa89b 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -9441,7 +9441,7 @@ solaris)
            platforms/solaris/bacula-fd \
            platforms/solaris/bacula-sd \
            platforms/solaris/bacula-dir"
-       if test x$DISTVER = x2.6 ; then
+       if test x$DISTVER = x5.6 ; then
            cat >> confdefs.h <<\EOF
 #define HAVE_OLD_SOCKOPT 1
 EOF

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 656c7ecc5cd40d5c2711331c074ad607b3246eba..3ac47139e9156093f0928fb09eea464be99ce210 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -16,6 +16,8 @@ Testing to do: (painful)
 - multiple simultaneous Volumes
 
 For 1.30 release:
+- Implement max_file_size in block.c
+- Add code if there is no mtio.h.
 - Add a section to the doc on Manual cycling
 - Look at purge jobs volume (at least document it, and see if it is
   logical).

diff --git a/bacula/src/cats/bdb.c b/bacula/src/cats/bdb.c
index 09f929401de84a85b8594fd9201a1a828dc827e3..659b18fd8fe3cf5e52a059b9492be232355c7142 100644 (file)
--- a/bacula/src/cats/bdb.c
+++ b/bacula/src/cats/bdb.c
@@ -275,7 +275,7 @@ void db_close_database(void *jcr, B_DB *mdb)
 
 void db_escape_string(char *snew, char *old, int len)
 {
-   memset(new, 0, len);
+   memset(snew, 0, len);
    bstrncpy(snew, old, len);
 }