missing dirchanges and dependencies to pam.

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index 424ca8adbc5de374c734fada0997160a21076a50..2f33ed9c93abe86904719667da246ddd1f8c1cbc 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -37,6 +37,7 @@ char ctdl_info_dir[PATH_MAX]="info";
 char ctdl_key_dir[PATH_MAX]="keys";
 char ctdl_message_dir[PATH_MAX]="messages";
 char ctdl_usrpic_dir[PATH_MAX]="userpics";
+char ctdl_bbsbase_dir[PATH_MAX]="";
 char ctdl_etc_dir[PATH_MAX]="";
 char ctdl_run_dir[PATH_MAX]="";
 char ctdl_spool_dir[PATH_MAX]="network";
@@ -111,6 +112,7 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        COMPUTE_DIRECTORY(ctdl_info_dir);
        COMPUTE_DIRECTORY(ctdl_message_dir);
        COMPUTE_DIRECTORY(ctdl_usrpic_dir);
+       COMPUTE_DIRECTORY(ctdl_bbsbase_dir);
 #ifndef HAVE_SPOOL_DIR
        basedir=ctdldir;
 #else

diff --git a/citadel/debian/control b/citadel/debian/control
index ce5aa60ab8f5606b01113dfa28c38ca9d66b7af1..6a84380a495ff8da6fa63078028f8528e92758ef 100644 (file)
--- 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.3-dev, libldap2-dev, libsasl2-dev, libgnutls11-dev, libgcrypt11-dev, bison
+Build-Depends: debhelper (>= 4.0.0), libical-dev, autotools-dev, zlib1g-dev , libssl-dev, libncurses5-dev, libdb4.3-dev, libldap2-dev, libsasl2-dev, libgnutls11-dev, libgcrypt11-dev, bison, libpam0g-dev
 Standards-Version: 3.6.1
 
 Package: citadel-server

diff --git a/citadel/debian/rules b/citadel/debian/rules
index 9af35c279b1ea9d6efda48d0ae96cf56e334616d..69bb060b07ec5f78e4b24f775ca60ec1aa8b5c1a 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -41,7 +41,7 @@ config.status: configure
                --with-datadir=/var/lib/citadel \
                --with-rundir=/var/run/citadel \
                --with-docdir=/usr/share/doc/citadel-doc/ \
-               --enable-autologin \
+               --enable-autologin --with-pam \
                --with-ical --with-db --with-ldap
 
 

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index a8e5e31eacf6a91f0677ab619e69dd8a7d07ca00..edc1253ac56121a1da403a172573130f53fef92c 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -751,7 +751,7 @@ void do_help_subst(char *buffer)
        help_subst(buffer, "^variantname", CITADEL);
        snprintf(buf2, sizeof buf2, "%d", config.c_maxsessions);
        help_subst(buffer, "^maxsessions", buf2);
-       help_subst(buffer, "^bbsdir", CTDLDIR);
+       help_subst(buffer, "^bbsdir", ctdl_bbsbase_dir);
 }