From 7d60a0eb1883774c46642a06be2576a0dc62fa6b Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 23 Jan 2003 20:28:21 +0000
Subject: [PATCH] Tighten up .conf permissions

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@316 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/ReleaseNotes            | 38 ++++++++++++++++++++++++++++++++--
 bacula/autoconf/Make.common.in |  1 +
 bacula/kernstodo               |  8 ++++---
 bacula/src/console/Makefile.in |  6 +++---
 bacula/src/dird/Makefile.in    |  6 +++---
 bacula/src/filed/Makefile.in   |  5 +++--
 bacula/src/stored/Makefile.in  |  6 +++---
 7 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index e3aade620f..039fdc964d 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -8,10 +8,44 @@ Major Changes this Release:
   testing the memory allocator, and eliminating places where bad
   input or strange characters could cause a crash.  
 - All known 1.28 bugs have been fixed.
-
+- Allow dynamic input of files into Include statements via a
+  program or reading a file. E.g.
+     Include = {
+        "|program input"
+        "<file_input"
+- Allow backup of raw partitions.
+- Allow input of data for backup via a fifo -- good for doing a
+  "hot" backup of a database.
+- Fixed a major bug that caused Bacula to crash if there were error
+  messages in the catalog interface code and you started two jobs
+  at the same time.
+- Fixed a buffer overrun bug found by James MacLean in filename quoting
+  if you had very long filenames with many single quotes in it.
+- Fixed a number of "recursive" calls to the print routines that would
+  eventually cause a crash -- pointed out by James MacLean.
 
 
 Other Changes this Release:
+- Bigendian is detected in configure making porting easier.
+- Added beginning of Gentoo platform files
+- Improved mtx-changer for handling subtle differences between differen
+  versions of mtx. Also beginning of handling Bar Code reading.
+- Quite a number of updates to the manual, with more examples ... 
+- Documented tape drive modes expected by Bacula.
+- Enhanced the dbcheck program with a few more options and better
+  user control as well as better display.
+- Fixed a bug in VolumeUseDuration reported by George Motter.
+- Implemented thread timer routines, currently used to time out FIFO's,
+  but ultimately will monitor connections.
+- Improved error reporting. Initial errors no longer changed by later errors.
+  Both FD and SD exit status reported in Backup output report.
+- Cancel now work within the File daemon (previously it always traversed all
+  files).
+- New Volume Files option for "update" that allows correcting incorrect volume       
+  file count entries in catalog due to a program crash.
+- Removed virtually all sm_check()s -- should run a bit faster.
+
 
 Items to note:
-- Nothing in particular.
+- Version 1.28 File daemons can be used with version 1.29, but it
+  is preferable to upgrade.
diff --git a/bacula/autoconf/Make.common.in b/bacula/autoconf/Make.common.in
index 431c35ee12..69d857be80 100644
--- a/bacula/autoconf/Make.common.in
+++ b/bacula/autoconf/Make.common.in
@@ -52,6 +52,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL@ -m 755
 INSTALL_DATA = @INSTALL@ -m 644
 INSTALL_SCRIPT = @INSTALL@ -m 755
+INSTALL_CONFIG = @INSTALL@ -m 640
 
 # Flags & libs
 CFLAGS = @CFLAGS@ 
diff --git a/bacula/kernstodo b/bacula/kernstodo
index c72521ebbc..75d05f151c 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -5,11 +5,9 @@ Documentation to do: (a little bit at a time)
 - Document running a test version.
 - Document query file format.
 - Document static linking
-- Document fifo and | and <
 - Document how to automatically backup all local partitions
 - Document problems with Verify and pruning.
 - Document how to use multiple databases.
-- Document FIFO storage device.
 
 
 Testing to do: (painful)
@@ -17,7 +15,8 @@ Testing to do: (painful)
 - blocksize recognition code.
 
 For 1.29 release:
-- Add prefixlinks to where or not where absolute links
+- Add prefixlinks to where or not where absolute links (DIR part done,
+  do FD part in release 1.30).
 
 For 1.30 release:
 - Get correct error status from run_program or open_bpipe().
@@ -825,3 +824,6 @@ Done: (see kernsdone for more)
 - InitVerify is getting pruned and it shouldn't (document it)
 - Make 1.28c release ??? NO do 1.29 directly
 - Set timeout on opening fifo for save or restore (findlib)
+- Document FIFO storage device.
+- Document fifo and | and <
+
diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index 646adb7a6f..f393800327 100644
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -77,12 +77,12 @@ install: all
 	else \
 	   destconf=$$srcconf; \
 	fi; \
-	echo "${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-	${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) console)
-	(cd $(DESTDIR)$(sysconfdir); $(RMF) console.conf
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) console.conf console.conf.new)
 
 
 
diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 9b6e1171f1..f67cbf8937 100644
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -98,8 +98,8 @@ install: all
 	else \
 	   destconf=$$srcconf; \
 	fi; \
-	echo "${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-	${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
 	if  test -f ${DESTDIR}${sysconfdir}/query.sql; then \
 	   $(MV) -f ${DESTDIR}${sysconfdir}/query.sql ${DESTDIR}${sysconfdir}/query.sql.save; \
 	fi 
@@ -108,7 +108,7 @@ install: all
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir)
-	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf)
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
 	(cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql)
 
 
diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 3a3f0d7bfc..9e1ea66ea3 100755
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -104,12 +104,13 @@ install: all
 	else \
 	   destconf=$$srcconf; \
 	fi; \
-	echo "${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-	${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd)
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd.conf)
+	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd.conf.new)
 
 
 
diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index b16f00440d..d8b371927b 100644
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -119,8 +119,8 @@ install: all
 	else \
 	   destconf=$$srcconf; \
 	fi; \
-	echo "${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-	${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-sd)
@@ -129,7 +129,7 @@ uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bcopy)
 	(cd $(DESTDIR)$(sbindir); $(RMF) bscan)
 	(cd $(DESTDIR)$(sbindir); $(RMF) btape)
-	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-sd.conf)
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-sd.conf bacula-sd.conf.new)
 
 
 clean:
-- 
2.39.5