fixed ldap helper setting compress option wrong, standardize on options

diff --git a/ChangeLog b/ChangeLog
index 19548f6dbf1e5776a0b4ad1f4938f5655a4fba80..8cd85c6f3be1302221a3c83df997c8fca1306a88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@ version 0.9.5 -- unreleased
         . Fixed shell command quoting issues, missing 'then' clauses, cleaned up
           compress=yes to be less redundant and not create empty uncompressed
           file (Closes: #394935)
+        . Fixed ninjahelper to properly set compress option, standardized on yes/no
+          instead of on/off
        maildir:
         . Added an examples file (Closes: Trac#23)
         mysql:

diff --git a/handlers/ldap.helper.in b/handlers/ldap.helper.in
index 697c720209595a84c62de09a7bd8fc32a7cd938e..5ccbe7e860726e3ab822270d24b3cb332ab828ef 100644 (file)
--- a/handlers/ldap.helper.in
+++ b/handlers/ldap.helper.in
@@ -5,11 +5,11 @@ HELPERS="$HELPERS ldap:ldap_database_backup"
 ldap_create_file() {
 while true; do
       checkBox "ldap action wizard" "check options (slapcat OR ldapsearch)" \
-         "slapcat" "export ldif using slapcat" on \
-         "ldapsearch" "export ldif using ldapsearch" off \
-         "compress" "compress the ldif output files" on
+         "slapcat" "export ldif using slapcat" yes \
+         "ldapsearch" "export ldif using ldapsearch" no \
+         "compress" "compress the ldif output files" yes
       status=$?
-      compress="compress = off"
+      compress="compress = no"
       method="method = <unset>"
       restart="restart = no"
       binddn=""
@@ -18,7 +18,7 @@ while true; do
       result="$REPLY"
       for opt in $result; do
          case $opt in
-           '"compress"') compress="compress = on";;
+           '"compress"') compress="compress = yes";;
            '"slapcat"')
               method="method = slapcat"
               [ "$_RESTART" == "yes" ] && restart="restart = yes"