richard: server/kolabd/kolabd ChangeLog, 1.43, 1.44 kolab_bootstrap.in, 1.16, 1.17

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv24986

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
use more fine grained variables for sasl configuration files.  Changed
emailserver_sasl_confdir to sasl_smtpdconffile and sasl_confdir to
sasl_authdconffile.  This is needed for non openpkg based distributions.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ChangeLog	14 Jan 2006 22:45:54 -0000	1.43
+++ ChangeLog	15 Jan 2006 10:46:34 -0000	1.44
@@ -1,3 +1,13 @@
+2006-01-15 Richard Bos <richard at radoeka.nl>
+	* dist_conf/common,
+	  dist_conf/debian,
+	  dist_conf/kolab,
+	  dist_conf/suse,
+	  templates/saslauthd.conf.template.in,
+	  templates/smtpd.conf.template.in: use more fine grained variables
+	  for sasl configuration files.  Changed emailserver_sasl_confdir to
+	  sasl_smtpdconffile and sasl_confdir to sasl_authdconffile.
+
 2006-01-14 Richard Bos <richard at radoeka.nl>
 	* dist_conf/kolab: removed restricted_kolab_usr and restricted_kolab_grp
 	  use the real value 'kolab-r' instead

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kolab_bootstrap.in	6 Jan 2006 20:37:43 -0000	1.16
+++ kolab_bootstrap.in	15 Jan 2006 10:46:34 -0000	1.17
@@ -395,7 +395,7 @@
     }
   };
 
-  my $confname = "@emailserver_sasl_conffile@";
+  my $confname = "@sasl_smtpconffile@";
   copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
 
   getopts('b');
@@ -747,7 +747,7 @@
   $bind_pw = getUserInput("Manager password");
   $bind_pw_hash = hashPassword($bind_pw);
 
-  my $confname = "@emailserver_sasl_conffile@";
+  my $confname = "@sasl_smtpconffile@";
   copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
 
   print "Checking server info...\n";