[asterisk-commits] tilghman: trunk r99696 - in /trunk: ./ build_tools/ configs/ contrib/scripts/...

Tue Jan 22 16:33:21 CST 2008

Author: tilghman
Date: Tue Jan 22 16:33:20 2008
New Revision: 99696

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99696
Log:
Add res_config_ldap for realtime LDAP engine.
(closes issue #5768)
 Reported by: mguesdon
 Patches: 
       res_config_ldap-v0.7.tar.gz uploaded by mguesdon (license 121)
       res_ldap.conf.sample uploaded by suretec (license 70)
       asterisk-v3.1.4.ldif uploaded by suretec (license 70)
       asterisk-v3.1.4.schema uploaded by suretec (license 70)
 Tested by: oej, mguesdon, suretec, cthorner

Added:
    trunk/configs/res_ldap.conf.sample
      - copied unchanged from r99694, team/group/res_config_ldap/configs/res_ldap.conf.sample
    trunk/contrib/scripts/asterisk.ldap-schema
      - copied unchanged from r99694, team/group/res_config_ldap/contrib/scripts/asterisk.ldap-schema
    trunk/contrib/scripts/asterisk.ldif
      - copied unchanged from r99694, team/group/res_config_ldap/contrib/scripts/asterisk.ldif
    trunk/doc/ldap.txt
      - copied unchanged from r99694, team/group/res_config_ldap/doc/ldap.txt
    trunk/res/res_config_ldap.c
      - copied, changed from r99694, team/group/res_config_ldap/res/res_config_ldap.c
Modified:
    trunk/   (props changed)
    trunk/CHANGES
    trunk/build_tools/menuselect-deps.in
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in
    trunk/makeopts.in

Change Statistics:
 0 files changed

Propchange: trunk/
------------------------------------------------------------------------------
    automerge = *

Propchange: trunk/
------------------------------------------------------------------------------
    automerge-email = russell at digium.com

Propchange: trunk/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-99662

Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?view=diff&rev=99696&r1=99695&r2=99696
==============================================================================

--- trunk/CHANGES (original)
+++ trunk/CHANGES Tue Jan 22 16:33:20 2008
@@ -463,6 +463,8 @@
      to retrieve, create, update, and delete realtime information from a remote
      web server.  Note that this module requires func_curl.so to be loaded for
      backend functionality.
+  * Added a new module, res_config_ldap, which permits the use of an LDAP
+     server for realtime data access.
 
 Miscellaneous 
 -------------

Modified: trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect-deps.in?view=diff&rev=99696&r1=99695&r2=99696
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Tue Jan 22 16:33:20 2008
@@ -13,6 +13,7 @@
 ISDNNET=@PBX_ISDNNET@
 IXJUSER=@PBX_IXJUSER@
 JACK=@PBX_JACK@
+LDAP=@PBX_LDAP@
 LTDL=@PBX_LTDL@
 LUA=@PBX_LUA@
 MISDN=@PBX_MISDN@

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=99696&r1=99695&r2=99696
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Jan 22 16:33:20 2008
@@ -216,6 +216,7 @@
 AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
 AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
 AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
+AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
 AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
 AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
 AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
@@ -814,6 +815,8 @@
 # Needed by unixodbc
 AST_EXT_LIB_CHECK([LTDL], [ltdl], [lt_dlinit], [ltdl.h], [])
 
+AST_EXT_LIB_CHECK([LDAP], [ldap], [ldap_first_attribute], [ldap.h])
+
 AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
 
 if test "${PBX_MISDN}" = 1; then

Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=99696&r1=99695&r2=99696
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Tue Jan 22 16:33:20 2008
@@ -372,6 +372,12 @@
 
 /* Define to indicate the ${JACK_DESCRIP} library version */
 #undef HAVE_JACK_VERSION
+
+/* Define this to indicate the ${LDAP_DESCRIP} library */
+#undef HAVE_LDAP
+
+/* Define to indicate the ${LDAP_DESCRIP} library version */
+#undef HAVE_LDAP_VERSION
 
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H

Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?view=diff&rev=99696&r1=99695&r2=99696
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Tue Jan 22 16:33:20 2008
@@ -102,6 +102,9 @@
 JACK_INCLUDE=@JACK_INCLUDE@
 JACK_LIB=@JACK_LIB@
 
+LDAP_INCLUDE=@LDAP_INCLUDE@
+LDAP_LIB=@LDAP_LIB@
+
 LUA_INCLUDE=@LUA_INCLUDE@
 LUA_LIB=@LUA_LIB@
 

Copied: trunk/res/res_config_ldap.c (from r99694, team/group/res_config_ldap/res/res_config_ldap.c)
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_ldap.c?view=diff&rev=99696&p1=team/group/res_config_ldap/res/res_config_ldap.c&r1=99694&p2=trunk/res/res_config_ldap.c&r2=99696
==============================================================================
--- team/group/res_config_ldap/res/res_config_ldap.c (original)
+++ trunk/res/res_config_ldap.c Tue Jan 22 16:33:20 2008
@@ -32,6 +32,7 @@
  */
 
 /*** MODULEINFO
+	<depend>ldap</depend>
  ***/
 
 #include "asterisk.h"


