(no commit message)

diff --git a/changelog b/changelog
index 3399011c6e1a126a8543686b97ed414d4417630c..d58e16f0f8b7a6f78d4e77a853bc4b872041cad0 100644 (file)
--- a/changelog
+++ b/changelog
@@ -2,6 +2,10 @@ version 0.x -- xxxxxxxxxxxxx
        ldap handler has new options: backup method to use (ldapsearch or
                slapcat), restart, passwordfile and binddn. Default backup method
                is set to ldapsearch as this is safer
        ldap handler has new options: backup method to use (ldapsearch or
                slapcat), restart, passwordfile and binddn. Default backup method
                is set to ldapsearch as this is safer

+       **********************
+       NOTE: to get the previous default behavior with the ldap handler, 
+       you must set "method = slapcat". The new default is ldapsearch.
+       **********************

        implemented fix so that the main script will echo fatal errors rather
                than being silent about them, this means an error message every hour
                if there is a major configuration problem (not a handler problem)
        implemented fix so that the main script will echo fatal errors rather
                than being silent about them, this means an error message every hour
                if there is a major configuration problem (not a handler problem)


@@ -22,7 +26,8 @@ version 0.x -- xxxxxxxxxxxxx
                sqldump doesn't need dbusername. (hotcopy still does).
     fixed bug in mysql handler which caused some passwords to not work.
         (.my.cnf files now have double quotes around password)
                sqldump doesn't need dbusername. (hotcopy still does).
     fixed bug in mysql handler which caused some passwords to not work.
         (.my.cnf files now have double quotes around password)

-    
+    considerably improved and changed the log file output.
+        

 version 0.5 -- April 12 2005
        rdiff handler works when remote sshd has a banner
        rdiff handler supports local dest 
 version 0.5 -- April 12 2005
        rdiff handler works when remote sshd has a banner
        rdiff handler supports local dest 

diff --git a/etc/backup.d/example.ldap b/etc/backup.d/example.ldap
index c35081bfe9dd99cdaf731b55c05956a99b053aea..adc1fcd039affb78a9f13db3a4ff372d8e165f0b 100644 (file)
--- a/etc/backup.d/example.ldap
+++ b/etc/backup.d/example.ldap
@@ -1,9 +1,10 @@
 ##
 ## configuration file for openldap backups 
 ##
 ##
 ## configuration file for openldap backups 
 ##

-## The LDIFs generated are suitable for use with slapadd. As the 
-## entries are in database order, not superior first order, they
-## cannot be loaded with ldapadd without being reordered.
+## If the method is set to "slapcat", the LDIFs generated are
+## suitable for use with slapadd. As the entries are in database
+## order, not superior first order, they cannot be loaded with
+## ldapadd without being reordered.

 ##
 
 ## backupdir (default /var/backups/ldap): the destination for the backups
 ##
 
 ## backupdir (default /var/backups/ldap): the destination for the backups


@@ -19,9 +20,9 @@
 ## compress (default yes): if set to yes, ldif exports are gzipped.
 # compress = yes
 
 ## compress (default yes): if set to yes, ldif exports are gzipped.
 # compress = yes
 

-## restart (default no): if set to yes, slapd is restarted before backups are
+## restart (default no): if set to yes, slapd is stopped before backups are

 ## performed, and then started again after they have finished, this is necessary
 ## performed, and then started again after they have finished, this is necessary

-## if your backend is ldbm and your method is slapcat, but unnecessary otherwise
+## if your backend is ldbm and your method is slapcat, but unnecessary otherwise.

 # restart = no
 
 ## method (default ldapsearch): either 'ldapsearch' or 'slapcat' 
 # restart = no
 
 ## method (default ldapsearch): either 'ldapsearch' or 'slapcat'