Fix stray */ + install bsmtp with user x permission

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index d7656c33e5306328f7cfebf473a7139766743315..67a1263208d3b28ae04f471e07a0af7d4101009b 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -55,7 +55,8 @@ For 1.33 Testing/Documentation:
 - Add subsections to the Disaster Recovery index section.
                 
 For 1.33
-- Restrict characters permitted in a name.
+- Make Bacula "poll a drive".
+- Fix "llist jobid=xx" where no fileset or client exists.
 - Release SQLite 2.8.8
 - If a tape is recycled while it is mounted, Stanislav Tvrudy must do an
   additional mount to deblock the job.
@@ -63,33 +64,20 @@ For 1.33
   Could I get you to double check the switch () statements in the
   job_check_maxwaittime and job_check_maxruntime functions in
   src/dird/job.c?
-- In restore, provide option for limiting to a particular Pool.
-- In restore, list FileSets that only have different base names --
-  i.e. any FileSet with the same name should be treated as the same.
 - From Johan Decock:
   bscan: sql_update.c:65 UPDATE File SET MD5='Ij+5kwN6TFIxK+8l8+/I+A' WHERE FileId=0
   bscan: bscan.c:1074 Could not add MD5/SHA1 to File record. ERR=sql_update.c:65 Update problem: affected_rows=0
 - Do scheduling by UTC using gmtime_r() in run_conf, scheduler, and   
   ua_status.!!! Thanks to Alan Brown for this tip.
-- Look at Dan's field width problems in PostgreSQL.
-- Look at effect of removing GROUP BYs.
-- In restore take all filesets with same base name.
-- From Alan Brown <ajb2@mssl.ucl.ac.uk>
-    BTW, there's a make install bug in 1.33 - with --enable-gnome,
-    gnome-console is built, but the binary and .conf are not being installed.
-- Make Scheduler sort jobs by StartTime, Priority.
-- Make sure smtp and any other useful program is executable by the world
-  in case Bacula is not running as root.
 - Look at updating Volume Jobs so that Max Volume Jobs = 1 will work
   correctly for multiple simultaneous jobs.
 - Correct code so that FileSet MD5 is calculated for < and | filename   
   generation.
-- Permit Bacula and apcupsd donations.
 - Mark Volume in error on error from WEOF.
 - Why does Bacula need the drive open to do "autochanger list" ?
 - Add a .list all files in the restore tree (probably also a list all files)
   Do both a long and short form.
-- Add a Media record flag that indicates that the Volume does disk
+- Implement the Media record flag that indicates that the Volume does disk 
   addressing.
 - Implement VolAddr, which is used when Volume is addressed like a disk,
   and form it from VolFile and VolBlock.
@@ -113,7 +101,6 @@ For 1.33
   resources, like Level? If so, I think I'd make it an optional directive
   in Job, Client, and Pool, with precedence such that Job overrides Client
   which in turn overrides Pool.
-- Fix Ctl-C crashing the Console (readline?).
 - Finish work on conio.c
 - To pass Include 1 or two letter commands
   I Name           Include name - first record
@@ -1054,3 +1041,19 @@ Done: (see kernsdone for more)
 - Setup a standard job that builds a bootstrap file and saves
   it with the catalog database.
 - See if a restore job can add a file to the tape (prohibit this).
+- Restrict characters permitted in a name.
+- In restore, provide option for limiting to a particular Pool.
+- In restore, list FileSets that only have different base names --
+  i.e. any FileSet with the same name should be treated as the same.
+- Make Scheduler sort jobs by StartTime, Priority.
+- Make sure smtp and any other useful program is executable by the world
+  in case Bacula is not running as root.
+- Look at Dan's field width problems in PostgreSQL.
+- Look at effect of removing GROUP BYs.
+- In restore take all filesets with same base name.
+- From Alan Brown <ajb2@mssl.ucl.ac.uk>
+    BTW, there's a make install bug in 1.33 - with --enable-gnome,
+    gnome-console is built, but the binary and .conf are not being installed.
+- Permit Bacula and apcupsd donations (not done for apcupsd).
+- Fix Ctl-C crashing the Console (readline?).
+

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 378c19a135edd050dedff14441fc683cd63e1f7b..80d2ba0dabdb3483660190fddd0ae9217e5805c7 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -480,7 +480,7 @@ static void *job_thread(void *arg)
            status = close_bpipe(bpipe);
            /*
             * Note, if we get an error here, do not mark the
-            *  job in error, simply report the error condition. */
+            *  job in error, simply report the error condition.   
             */
            if (status != 0) {
               if (jcr->JobStatus == JS_Terminated) {

diff --git a/bacula/src/lib/bsock.h b/bacula/src/lib/bsock.h
index 89910344b5af411f8dab1ba66cc1037fa47405c7..4d4b49dd84bc142cffca1a181113106ac6129c54 100644 (file)
--- a/bacula/src/lib/bsock.h
+++ b/bacula/src/lib/bsock.h
@@ -58,15 +58,18 @@ struct BSOCK {
 };      
 
 /* Signal definitions for use in bnet_sig() */
-#define BNET_EOD         -1           /* End of data stream, new data may follow */
-#define BNET_EOD_POLL    -2           /* End of data and poll all in one */
-#define BNET_STATUS      -3           /* Send full status */
-#define BNET_TERMINATE   -4           /* Conversation terminated, doing close() */
-#define BNET_POLL        -5           /* Poll request, I'm hanging on a read */
-#define BNET_HEARTBEAT   -6           /* Heartbeat Response requested */
-#define BNET_HB_RESPONSE -7           /* Only response permited to HB */
-#define BNET_PROMPT      -8           /* Prompt for UA */
-#define BNET_BTIME       -9           /* Send UTC btime */
+enum {
+   BNET_EOD            = -1,          /* End of data stream, new data may follow */
+   BNET_EOD_POLL       = -2,          /* End of data and poll all in one */
+   BNET_STATUS         = -3,          /* Send full status */
+   BNET_TERMINATE      = -4,          /* Conversation terminated, doing close() */
+   BNET_POLL           = -5,          /* Poll request, I'm hanging on a read */
+   BNET_HEARTBEAT      = -6,          /* Heartbeat Response requested */
+   BNET_HB_RESPONSE    = -7,          /* Only response permited to HB */
+   BNET_PROMPT         = -8,          /* Prompt for UA */
+   BNET_BTIME          = -9,          /* Send UTC btime */
+   BNET_BREAK          = -10          /* Stop current command -- ctl-c */
+};
 
 #define BNET_SETBUF_READ  1           /* Arg for bnet_set_buffer_size */
 #define BNET_SETBUF_WRITE 2           /* Arg for bnet_set_buffer_size */

diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index afee4657070b11f0194b72496cdbdaf33b1ef836..1896ffb09657c92dd0748329d72cf3c711022e33 100644 (file)
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -69,8 +69,10 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+# Allow non-root execution of bsmtp for non-root Directors
 install: bsmtp
        $(INSTALL_PROGRAM) bsmtp $(DESTDIR)$(sbindir)/bsmtp      
+       chmod 755 $(DESTDIR)$(sbindir)/bsmtp
        $(INSTALL_PROGRAM) dbcheck $(DESTDIR)$(sbindir)/dbcheck      
 
 uninstall: