Minor updates

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

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 84811d554d27864502058b5e063b35235fb5b009..e195d2f8f1739028b4e0aa84eaad4f6d600ba965 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -108,6 +108,7 @@ ClientId=%d, JobTDate=%s WHERE JobId=%d",
    stat = UPDATE_DB(mdb, mdb->cmd);
    db_unlock(mdb);
 #ifdef HAVE_SQLITE
+   /******FIXME***** do this machine independently */
    my_sqlite_query(mdb, "BEGIN");     /* begin transaction */
 #endif
    return stat;

diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index 494120d07a130351936fcbe91948ae19712370dc..2f1365e7416f3576c1f854d28478f0feb49040bb 100644 (file)
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -325,6 +325,7 @@ void do_messages(UAContext *ua, char *cmd)
 {
    char msg[2000];
    int mlen; 
+   int do_truncate = FALSE;
 
    P(con_mutex);
    rewind(con_fd);
@@ -334,8 +335,11 @@ void do_messages(UAContext *ua, char *cmd)
       strcpy(ua->UA_sock->msg, msg);
       ua->UA_sock->msglen = mlen;
       bnet_send(ua->UA_sock);
+      do_truncate = TRUE;
+   }
+   if (do_truncate) {
+      ftruncate(fileno(con_fd), 0L);
    }
-   ftruncate(fileno(con_fd), 0L);
    console_msg_pending = FALSE;
    ua->user_notified_msg_pending = FALSE;
    V(con_mutex);

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index f053806ffc20f387d6f83a7e53f2237d9771e6ce..62c6f4eec8da1ac9dd03743df7c7e236511a45e4 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -97,7 +97,7 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 smtp:  smtp.o
-       $(CXX) $(LDFLAGS) -static -L. -o $@ smtp.o $(LIBS) $(DLIB) -lbac -lm
+       $(CXX) $(LDFLAGS) -L. -o $@ smtp.o $(LIBS) $(DLIB) -lbac -lm
 
 rwlock_test:  rwlock.o
        rm -f rwlock.o

diff --git a/bacula/src/version.h b/bacula/src/version.h
index fbb6563d8cc4c15250d9f093f89e0c5263dd06dc..8e6dd7e97d343211c212d3439cb91b861596855c 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #define VERSION "1.23"
 #define VSTRING "1"
-#define DATE    "7 July 2002"
-#define LSMDATE "07Jul02"
+#define DATE    "12 July 2002"
+#define LSMDATE "12Jul02"
 
 /* Debug flags */
 #define DEBUG 1