[Pkg-openldap-devel] r1422 - in openldap/trunk/debian: . patches

[vorlon at alioth.debian.org]

tags 662940 pending
thanks

Author: vorlon
Date: 2012-06-17 00:17:53 +0000 (Sun, 17 Jun 2012)
New Revision: 1422

Added:
   openldap/trunk/debian/patches/shell-config
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
* Incorporate NMU (thanks, Julien Cristau, Mattias Ellert):
  - Backport fix for shell backend configuration.  Closes: #662940.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2012-06-16 20:57:56 UTC (rev 1421)
+++ openldap/trunk/debian/changelog	2012-06-17 00:17:53 UTC (rev 1422)
@@ -1,8 +1,9 @@
 openldap (2.4.28-2) UNRELEASED; urgency=low
 
-  * Incorporate NMU (thanks, Julien Cristau):
+  * Incorporate NMU (thanks, Julien Cristau, Mattias Ellert):
     - Disable the mdb backend on non-Linux, it looks like it doesn't work
       with linuxthreads (closes: #654824).
+    - Backport fix for shell backend configuration.  Closes: #662940.
 
   [ Peter Marschall ]
   * debian/slapd.scripts-common: avoid grep warnings

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2012-06-16 20:57:56 UTC (rev 1421)
+++ openldap/trunk/debian/patches/series	2012-06-17 00:17:53 UTC (rev 1422)
@@ -18,3 +18,4 @@
 switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
 heimdal-fix
+shell-config

Added: openldap/trunk/debian/patches/shell-config
===================================================================
--- openldap/trunk/debian/patches/shell-config	                        (rev 0)
+++ openldap/trunk/debian/patches/shell-config	2012-06-17 00:17:53 UTC (rev 1422)
@@ -0,0 +1,57 @@
+X-Git-Url: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Fconfig.c;h=ff0d1cbcb0601427d0197dbdbe4bd5faba24628f;hp=41e1d1c67d97495f2c770d75fe9c4afabb8989fd;hb=6143aa0c18c8e0f73f4855b884b30405adabfc99;hpb=b4d403ea310022ca4ffcbf31fa20ead6c754f28d
+
+diff --git a/servers/slapd/back-shell/config.c b/servers/slapd/back-shell/config.c
+index 41e1d1c..ff0d1cb 100644
+--- a/servers/slapd/back-shell/config.c
++++ b/servers/slapd/back-shell/config.c
+@@ -53,42 +53,42 @@ enum {
+ };
+ 
+ static ConfigTable shellcfg[] = {
+-	{ "bind", "args", 2, 0, 0, ARG_STRING|ARG_MAGIC|SHELL_BIND, shell_cf,
++	{ "bind", "args", 2, 0, 0, ARG_MAGIC|SHELL_BIND, shell_cf,
+ 		"( OLcfgDbAt:10.1 NAME 'olcShellBind' "
+ 			"DESC 'Bind command and arguments' "
+ 			"EQUALITY caseExactMatch "
+ 			"SYNTAX OMsDirectoryString SINGLE-VALUE ) ", NULL, NULL },
+-	{ "unbind", "args", 2, 0, 0, ARG_STRING|ARG_MAGIC|SHELL_UNBIND, shell_cf,
++	{ "unbind", "args", 2, 0, 0, ARG_MAGIC|SHELL_UNBIND, shell_cf,
+ 		"( OLcfgDbAt:10.2 NAME 'olcShellUnbind' "
+ 			"DESC 'Unbind command and arguments' "
+ 			"EQUALITY caseExactMatch "
+ 			"SYNTAX OMsDirectoryString SINGLE-VALUE ) ", NULL, NULL },
+-	{ "search", "args", 2, 0, 0, ARG_STRING|ARG_MAGIC|SHELL_SEARCH, shell_cf,
++	{ "search", "args", 2, 0, 0, ARG_MAGIC|SHELL_SEARCH, shell_cf,
+ 		"( OLcfgDbAt:10.3 NAME 'olcShellSearch' "
+ 			"DESC 'Search command and arguments' "
+ 			"EQUALITY caseExactMatch "
+ 			"SYNTAX OMsDirectoryString SINGLE-VALUE ) ", NULL, NULL },
+-	{ "compare", "args", 2, 0, 0, ARG_STRING|ARG_MAGIC|SHELL_COMPARE, shell_cf,
++	{ "compare", "args", 2, 0, 0, ARG_MAGIC|SHELL_COMPARE, shell_cf,
+ 		"( OLcfgDbAt:10.4 NAME 'olcShellCompare' "
+ 			"DESC 'Compare command and arguments' "
+ 			"EQUALITY caseExactMatch "
+ 			"SYNTAX OMsDirectoryString SINGLE-VALUE ) ", NULL, NULL },
+-	{ "modify", "args", 2, 0, 0, ARG_STRING|ARG_MAGIC|SHELL_MODIFY, shell_cf,
++	{ "modify", "args", 2, 0, 0, ARG_MAGIC|SHELL_MODIFY, shell_cf,
+ 		"( OLcfgDbAt:10.5 NAME 'olcShellModify' "
+ 			"DESC 'Modify command and arguments' "
+ 			"EQUALITY caseExactMatch "
+ 			"SYNTAX OMsDirectoryString SINGLE-VALUE ) ", NULL, NULL },
+-	{ "modrdn", "args", 2, 0, 0, ARG_STRING|ARG_MAGIC|SHELL_MODRDN, shell_cf,
++	{ "modrdn", "args", 2, 0, 0, ARG_MAGIC|SHELL_MODRDN, shell_cf,
+ 		"( OLcfgDbAt:10.6 NAME 'olcShellModRDN' "
+ 			"DESC 'ModRDN command and arguments' "
+ 			"EQUALITY caseExactMatch "
+ 			"SYNTAX OMsDirectoryString SINGLE-VALUE ) ", NULL, NULL },
+-	{ "add", "args", 2, 0, 0, ARG_STRING|ARG_MAGIC|SHELL_ADD, shell_cf,
++	{ "add", "args", 2, 0, 0, ARG_MAGIC|SHELL_ADD, shell_cf,
+ 		"( OLcfgDbAt:10.7 NAME 'olcShellAdd' "
+ 			"DESC 'Add command and arguments' "
+ 			"EQUALITY caseExactMatch "
+ 			"SYNTAX OMsDirectoryString SINGLE-VALUE ) ", NULL, NULL },
+-	{ "delete", "args", 2, 0, 0, ARG_STRING|ARG_MAGIC|SHELL_DELETE, shell_cf,
++	{ "delete", "args", 2, 0, 0, ARG_MAGIC|SHELL_DELETE, shell_cf,
+ 		"( OLcfgDbAt:10.8 NAME 'olcShellDelete' "
+ 			"DESC 'Delete command and arguments' "
+ 			"EQUALITY caseExactMatch "