[Pkg-openldap-devel] r755 - openldap/trunk-2.3/debian

[Matthijs Mohlmann]

Author: matthijs
Date: 2006-12-09 16:43:11 +0100 (Sat, 09 Dec 2006)
New Revision: 755

Modified:
   openldap/trunk-2.3/debian/slapd.config
   openldap/trunk-2.3/debian/slapd.scripts-common
Log:
 * Move db_input allow v2 binds to scripts-common and make sure this question
   isn't ask when the user wants manual configuration.


Modified: openldap/trunk-2.3/debian/slapd.config
===================================================================
--- openldap/trunk-2.3/debian/slapd.config	2006-12-09 15:42:02 UTC (rev 754)
+++ openldap/trunk-2.3/debian/slapd.config	2006-12-09 15:43:11 UTC (rev 755)
@@ -15,6 +15,7 @@
     set_defaults_for_unseen_entries
     query_initial_config
     crypt_admin_pass
+    configure_allow_v2_binds
   fi
 fi
 
@@ -22,6 +23,7 @@
 if [ "$1" = configure ] && [ -n "$2" ]; then
 	configure_ldbm_to_bdb_migration
 	configure_dumping
+    configure_allow_v2_binds
 fi
    
 # On upgrade from pre-2.1 we have to ask if we shall fix the config file (if
@@ -42,10 +44,6 @@
   fi
 fi
 
-# Ask if the user would like their package to support LDAPv2..
-# This was the default in older versions but we want to ask
-# for new installs too in case the user needs it..
-db_input medium slapd/allow_ldap_v2 || true
 db_go || true
 db_stop || true
 

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2006-12-09 15:42:02 UTC (rev 754)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2006-12-09 15:43:11 UTC (rev 755)
@@ -63,6 +63,14 @@
 	fi
 }
 # }}}
+configure_allow_v2_binds() {                        # {{{
+# Ask if the user would like their package to support LDAPv2..
+# This was the default in older versions but we want to ask
+# for new installs too in case the user needs it..
+
+    db_input medium slapd/allow_ldap_v2 || true
+}
+# }}}
 database_dumping_enabled() {						# {{{
 # Check if the user has enabled database dumping for the current situation.
 # Return success if yes.