[Openvas-commits] r7320 - in trunk/openvas-libraries: . misc

[scm-commit@wald.intevation.org]

Author: felix
Date: 2010-04-16 09:33:27 +0200 (Fri, 16 Apr 2010)
New Revision: 7320

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/MANIFEST
   trunk/openvas-libraries/misc/CMakeLists.txt
Log:
* MANIFEST: Added misc/ldap_auth module.

* misc/CMakeLists.txt: Allow to enable ldap support at configure time
- use -DBUILD_WITH_LDAP=ON to activate. Added check for openldap in
that case, include ldap_auth module and add definition.


Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2010-04-16 06:53:50 UTC (rev 7319)
+++ trunk/openvas-libraries/ChangeLog	2010-04-16 07:33:27 UTC (rev 7320)
@@ -1,8 +1,16 @@
 2010-04-16  Felix Wolfsteller <felix.wolfsteller at greenbone.net>
 
+	* MANIFEST: Added misc/ldap_auth module.
+
+	* misc/CMakeLists.txt: Allow to enable ldap support at configure time
+	- use -DBUILD_WITH_LDAP=ON to activate. Added check for openldap in
+	that case, include ldap_auth module and add definition.
+
+2010-04-16  Felix Wolfsteller <felix.wolfsteller at greenbone.net>
+
 	* base/CMakeLists.txt, hg/CMakeLists.txt, misc/CMakeLists.txt,
-	nasl/CMakeLists.txt, omp/CMakeLists.txt: Unified syntax of CMakeLists
-	to allow easier reading and extraction of macros.
+	nasl/CMakeLists.txt, omp/CMakeLists.txt: Unified formatting of
+	CMakeLists to allow easier reading and extraction of macros.
 
 2010-04-16  Felix Wolfsteller <felix.wolfsteller at greenbone.net>
 

Modified: trunk/openvas-libraries/MANIFEST
===================================================================
--- trunk/openvas-libraries/MANIFEST	2010-04-16 06:53:50 UTC (rev 7319)
+++ trunk/openvas-libraries/MANIFEST	2010-04-16 07:33:27 UTC (rev 7320)
@@ -81,6 +81,8 @@
 misc/ids_send.h
 misc/kb.c
 misc/kb.h
+misc/ldap_auth.c
+misc/ldap_auth.h
 misc/network.c
 misc/network.h
 misc/otp.h

Modified: trunk/openvas-libraries/misc/CMakeLists.txt
===================================================================
--- trunk/openvas-libraries/misc/CMakeLists.txt	2010-04-16 06:53:50 UTC (rev 7319)
+++ trunk/openvas-libraries/misc/CMakeLists.txt	2010-04-16 07:33:27 UTC (rev 7320)
@@ -144,6 +144,20 @@
   message (FATAL_ERROR "The uuid library is required.")
 endif (NOT UUID)
 
+# Check for openldap if -DBUILD_WITH_LDAP=ON was given
+if (NOT BUILD_WITH_LDAP)
+   # fine
+else (NOT BUILD_WITH_LDAP)
+   message (STATUS "Looking for openldap...")
+   find_library (OPENLDAP ldap)
+   message (STATUS "Looking for openldap... ${OPENLDAP}")
+   if (NOT OPENLDAP)
+     message (FATAL_ERROR "Could not build with ldap support - no ldap library"
+              " was found. Consider building with -DBUILD_WITH_LDAP=OFF")
+   endif (NOT OPENLDAP)
+   add_definitions (-DENABLE_LDAP_AUTH=1)
+endif (NOT BUILD_WITH_LDAP)
+
 # Library
 
 message ("-- prepare for add libraries ...")
@@ -164,6 +178,10 @@
              scanners_utils.h services1.h
              share_fd.h store.h system.h www_funcs.h)
 
+if (BUILD_WITH_LDAP)
+  list (APPEND FILES ldap_auth.c)
+endif (BUILD_WITH_LDAP)
+
 link_directories (${CMAKE_CURRENT_SOURCE_DIR}/../base)
 
 add_library (openvas_misc_static STATIC ${FILES})
@@ -194,8 +212,13 @@
   add_definitions (-DONF_DIR=\\\"${OPENVAS_SYSCONF_DIR}\\\")
 endif (OPENVAS_SYSCONF_DIR)
 
-target_link_libraries (openvas_misc_static uuid ${GLIB_LDFLAGS})
-target_link_libraries (openvas_misc_shared uuid ${GLIB_LDFLAGS})
+if (NOT BUILD_WITH_LDAP)
+  target_link_libraries (openvas_misc_static uuid ${GLIB_LDFLAGS})
+  target_link_libraries (openvas_misc_shared uuid ${GLIB_LDFLAGS})
+else (NOT BUILD_WITH_LDAP)
+  target_link_libraries (openvas_misc_static uuid ${GLIB_LDFLAGS} ldap)
+  target_link_libraries (openvas_misc_shared uuid ${GLIB_LDFLAGS} ldap)
+endif (NOT BUILD_WITH_LDAP)
 
 # install library
 message ("-- installing libraries...")