From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 7 Mar 2003 17:30:31 +0000 (+0000)
Subject: Additional Solaris fix + bdb.c fix
X-Git-Tag: Release-1.30~95
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=53ea6a4ab2a6cd67de9aba1ccae291b0eae9ce78;p=bacula%2Fbacula

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 9d026cf669..5f18bdc977 100644
--- 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 e85591bdc0..69ad6f6533 100755
--- 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 656c7ecc5c..3ac47139e9 100644
--- 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 09f929401d..659b18fd8f 100644
--- 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);
 }