From 777aab7cd829db878393f7c5becc1fc48cd2153e Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 25 Jul 2004 10:40:29 +0000
Subject: [PATCH] fixed two bugs from Debian BTS

---
 lam-0.4/debian/changelog |  8 ++++++++
 lam-0.4/debian/packages  | 16 +++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lam-0.4/debian/changelog b/lam-0.4/debian/changelog
index 360afc81..c6e13566 100644
--- a/lam-0.4/debian/changelog
+++ b/lam-0.4/debian/changelog
@@ -1,3 +1,11 @@
+ldap-account-manager (0.4.6-2) unstable; urgency=low
+
+  * Added template to change master configuration password.
+  * Closes: #257137: Interface configuration has a default password
+  * Closes: #260733: expanded PHP dependency with libapache2-mod-php4
+
+ -- Roland Gruber <post@rolandgruber.de>  Fri, 23 Jul 2004 14:50:56 +0200
+
 ldap-account-manager (0.4.6-1) unstable; urgency=low
 
   * Updated to new upstream version 0.4.6.
diff --git a/lam-0.4/debian/packages b/lam-0.4/debian/packages
index 507f8ad5..83776ccb 100644
--- a/lam-0.4/debian/packages
+++ b/lam-0.4/debian/packages
@@ -14,7 +14,7 @@ Major-Changes:
 
 Package: ldap-account-manager
 Architecture: all
-Depends: php4 | php4-cgi, php4-ldap, apache | apache-ssl | httpd, perl, wwwconfig-common, debconf
+Depends: php4 | php4-cgi | libapache2-mod-php4, php4-ldap, apache | apache-ssl | httpd, perl, wwwconfig-common, debconf
 Recommends: php4-mhash
 Suggests: ldap-server, sudo, php4-mcrypt
 Conflicts: php4-apc
@@ -95,12 +95,23 @@ Templates:
   LAM will add an alias to your httpd.conf which allows you to
   access LAM at http(s)://localhost/lam. If you want an alias other than
   "lam" please specify it here.
+ .
+ Template: ldap-account-manager/passwd
+ Type: string
+ Default: lam
+ Description: Enter master configuration password (clear text):
+  The configuration profiles are secured by a master password.
+  You will need it to create and delete profiles. As default it is
+  set to "lam" and can be changed directly in LAM. But you can also
+  change it now.
 Config: bash
  db_subst "ldap-account-manager/webserver" "webserver" "Apache" || true
  db_input medium "ldap-account-manager/webserver" || true
  db_go
  db_input low "ldap-account-manager/alias" || true
  db_go
+ db_input low "ldap-account-manager/passwd" || true
+ db_go
 Preinst: bash
  if [ ! -d /var/lib/ldap-account-manager ]; then \
    mkdir /var/lib/ldap-account-manager; fi
@@ -130,6 +141,9 @@ Postinst: bash
      alias="$RET"
 	 perl -pi -e "s/Alias \/.* \/usr\/share\/ldap-account-manager/Alias \/$alias \/usr\/share\/ldap-account-manager/g"\
          /etc/ldap-account-manager/apache.conf
+     db_get "ldap-account-manager/passwd"
+     passwd="$RET"
+	 perl -pi -e "s/password: .*/password: $passwd/g" /etc/ldap-account-manager/config.cfg
      db_get "ldap-account-manager/webserver"
      webserver="$RET"
      case "$webserver" in