From: Wilfried Göesgens <willi@citadel.org>
Date: Thu, 21 Dec 2006 01:58:17 +0000 (+0000)
Subject: * depend on bdb 4.3 or 4.4
X-Git-Tag: v7.86~3769
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d623511140cbd2a395feff7fcd84b2ef8c2700ac

* depend on bdb 4.3 or 4.4
* depend on the db4.4|3 util package, as it provides the stuff we need for the cleanup script
* ask for auth mode
* init pointer
* adjust configure call
---

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index 1cf746837..9c2e09c97 100644
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -160,6 +160,12 @@ case "$1" in
 
 	db_get citadel/Administrator && admin="$RET"
 	db_get citadel/ServerIPAddress && ip_addr="$RET"
+	db_get citadel/LoginType && enable_unix_auth="$RET"
+	if test "$enable_unix_auth" = "true"; then
+	    export ENABLE_UNIX_AUTH=yes
+	else
+	    export ENABLE_UNIX_AUTH=no
+	fi
 	export IP_ADDR=$ip_addr
 	export CITADEL=''
 	export CITADEL_INSTALLER=yes
@@ -169,21 +175,6 @@ case "$1" in
 	export CREATE_INITTAB_ENTRY=no
 	export NO_INIT_SCRIPTS=yes
 	echo "applying your settings."
-# citadel home
-# sysadmin
-# uid
-# server ip
-# port
-# postfix?
-# exim?
-#	echo "/usr/sbin
-#$admin
-#citadel
-#$ip_addr
-#
-#no
-#no
-#" | \
 	/usr/lib/citadel-server/setup -q
 	if test -S /var/run/citadel/citadel.socket; then 
 	    /usr/sbin/sendcommand "DOWN"
@@ -194,7 +185,7 @@ case "$1" in
 	done
 
 	update-rc.d citadel defaults >/dev/null
-
+#	/etc/init.d/citadel start
 	echo "run /etc/init.d/citadel start to start citadel service."
     #### There are three sub-cases:
     ###if test "${2+set}" != set; then
diff --git a/citadel/debian/citadel-server.templates b/citadel/debian/citadel-server.templates
index 741882876..dd59755f8 100644
--- a/citadel/debian/citadel-server.templates
+++ b/citadel/debian/citadel-server.templates
@@ -8,6 +8,23 @@ Description: Listen IP for Citadel
   instances of Citadel on the same computer.
 
 
+Template: citadel/LoginType
+Type: boolean
+Default: false
+Description: Citadel Account Mode
+  Normally, a Citadel system uses a "black box" authentication mode.
+  This means that users do not have accounts or home directories on
+  the underlying host system -- Citadel manages its own user database.
+  However, if you wish to override this behavior, you can enable the
+  host based authentication mode which is traditional for Unix systems.
+  You will allso need host based authentication if you want to authenticate
+  against an ldap directory or another pam source for example.
+  WARNING: do *not* change this setting once your system is installed.
+  .
+  (Answer "no" unless you completely understand this option)
+  Do you want to enable host based authentication mode?
+
+
 Template: citadel/Administrator
 Type: string
 Default: Administrator
diff --git a/citadel/debian/control b/citadel/debian/control
index 826797f3f..0ea193cdc 100644
--- a/citadel/debian/control
+++ b/citadel/debian/control
@@ -2,7 +2,7 @@ Source: citadel
 Section: mail
 Priority: optional
 Maintainer: Wilfried Goesgens <w.goesgens@chaosindutries.de>
-Build-Depends: debhelper (>= 4.0.0), libical-dev, autotools-dev, zlib1g-dev , libssl-dev, libncurses5-dev, libdb4.4-dev, libldap2-dev, libsasl2-dev, libgnutls-dev | libgnutls11-dev, libgcrypt11-dev, bison, libpam0g-dev, gettext, libdb3-util
+Build-Depends: debhelper (>= 4.0.0), libical-dev, autotools-dev, zlib1g-dev , libssl-dev, libncurses5-dev, libdb4.4-dev|libdb4.3-dev, libldap2-dev, libsasl2-dev, libgnutls-dev | libgnutls11-dev, libgcrypt11-dev, bison, libpam0g-dev, gettext, libsieve2-dev
 Standards-Version: 3.6.1
 
 Package: citadel-server
@@ -10,7 +10,7 @@ Architecture: any
 Pre-Depends: debconf
 Provides: pop3-server, imap-server
 Conflicts: pop3-server, imap-server
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, libical, libssl0.9.7, libncurses5, libdb4.4, libldap2, libsasl2, libgnutls | libgnutls11, libgcrypt11, libc6, libgpg-error0, ucf, libdb3-util
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, libical, libgnutls | libgnutls11, ucf, db4.4-util|db4.3-util
 Suggests: citadel-mta
 Description: Citadel is the good old BBS system grown up to a Groupware.
  Citadel is a different kind of messaging and collaboration platform. While 
diff --git a/citadel/debian/rules b/citadel/debian/rules
index cec20b37b..f3016b9f8 100755
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -41,8 +41,10 @@ config.status: configure
 		--with-datadir=/var/lib/citadel \
 		--with-rundir=/var/run/citadel \
 		--with-docdir=/usr/share/doc/citadel-doc/ \
-		--enable-autologin --with-pam \
-		--with-ical --with-db --with-ldap
+		--with-pam \
+		--with-ical \
+		--with-db \
+		--with-ldap
 
 
 #Architecture 
diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 1934e0de0..428b47eef 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -565,6 +565,7 @@ void CtdlRegisterServiceHook(int tcp_port,
 	char *message;
 	char *error;
 
+	error = NULL;
 	newfcn = (struct ServiceFunctionHook *)
 	    malloc(sizeof(struct ServiceFunctionHook));
 	message = (char*) malloc (SIZ);