From 66f7b9443527e469bf9245d897b151ec3b95a3e9 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Thu, 21 Oct 2010 19:23:37 +0000
Subject: [PATCH] Change sql files (Closes: #196)

---
 modules/lemonldap-ng-common/MANIFEST          |  3 ++-
 .../tools/lmConfig.CDBI.mysql                 |  6 +++++
 .../tools/lmConfig.RDBI.mysql                 |  5 +++++
 .../lemonldap-ng-common/tools/lmConfig.mysql  | 22 -------------------
 modules/lemonldap-ng-portal/Makefile.PL       |  2 +-
 5 files changed, 14 insertions(+), 24 deletions(-)
 create mode 100644 modules/lemonldap-ng-common/tools/lmConfig.CDBI.mysql
 create mode 100644 modules/lemonldap-ng-common/tools/lmConfig.RDBI.mysql
 delete mode 100644 modules/lemonldap-ng-common/tools/lmConfig.mysql

diff --git a/modules/lemonldap-ng-common/MANIFEST b/modules/lemonldap-ng-common/MANIFEST
index deeec40ce..042fe76e8 100644
--- a/modules/lemonldap-ng-common/MANIFEST
+++ b/modules/lemonldap-ng-common/MANIFEST
@@ -40,5 +40,6 @@ t/35-Common-Crypto.t
 t/36-Common-Regexp.t
 t/99-pod.t
 tools/apache-session-mysql.sql
-tools/lmConfig.mysql
+tools/lmConfig.CDBI.mysql
+tools/lmConfig.RDBI.mysql
 tools/sso.schema
diff --git a/modules/lemonldap-ng-common/tools/lmConfig.CDBI.mysql b/modules/lemonldap-ng-common/tools/lmConfig.CDBI.mysql
new file mode 100644
index 000000000..bfc4114e9
--- /dev/null
+++ b/modules/lemonldap-ng-common/tools/lmConfig.CDBI.mysql
@@ -0,0 +1,6 @@
+CREATE TABLE lmConfig (
+	cfgNum int not null primary key,
+	field text,
+	value longblob
+);
+
diff --git a/modules/lemonldap-ng-common/tools/lmConfig.RDBI.mysql b/modules/lemonldap-ng-common/tools/lmConfig.RDBI.mysql
new file mode 100644
index 000000000..b59ae71b0
--- /dev/null
+++ b/modules/lemonldap-ng-common/tools/lmConfig.RDBI.mysql
@@ -0,0 +1,5 @@
+CREATE TABLE lmConfig (
+		cfgNum int not null primary key,
+        data longblob
+		);
+
diff --git a/modules/lemonldap-ng-common/tools/lmConfig.mysql b/modules/lemonldap-ng-common/tools/lmConfig.mysql
deleted file mode 100644
index b3c594824..000000000
--- a/modules/lemonldap-ng-common/tools/lmConfig.mysql
+++ /dev/null
@@ -1,22 +0,0 @@
-CREATE TABLE lmConfig (
-		cfgNum int not null primary key,
-		locationRules text,
-		exportedHeaders text,
-		globalStorage text,
-		globalStorageOptions text,
-		macros text,
-		groups text,
-		portal text,
-		domain text,
-		ldapServer text,
-		ldapPort int,
-		ldapBase text,
-		securedCookie int,
-		cookieName text,
-		authentication text,
-		exportedVars text,
-		managerDn text,
-		managerPassword text,
-        timeout int,
-		whatToTrace text
-		);
diff --git a/modules/lemonldap-ng-portal/Makefile.PL b/modules/lemonldap-ng-portal/Makefile.PL
index e22988df9..31081057e 100644
--- a/modules/lemonldap-ng-portal/Makefile.PL
+++ b/modules/lemonldap-ng-portal/Makefile.PL
@@ -11,7 +11,7 @@ WriteMakefile(
             'Convert::PEM'          => 0,
             'Crypt::OpenSSL::X509'  => 0,
             'Email::Date::Format'   => 0,
-            'Lasso'                 => 2.3.0,
+            'Lasso'                 => '2.3.0',
             'MIME::Lite'            => 0,
             'Net::OpenID::Consumer' => 0,
             'Net::OpenID::Server'   => 0,