25 lines
1.5 KiB
Plaintext
25 lines
1.5 KiB
Plaintext
$OpenBSD: patch-cgi-bin_openwebmail_ow-shared_pl,v 1.3 2003/07/16 10:32:14 kevlo Exp $
|
|
--- cgi-bin/openwebmail/ow-shared.pl.orig Mon Jun 16 18:12:48 2003
|
|
+++ cgi-bin/openwebmail/ow-shared.pl Wed Jul 16 18:00:18 2003
|
|
@@ -264,16 +264,16 @@ sub openwebmail_exit {
|
|
# init user globals, switch euid
|
|
sub userenv_init {
|
|
if (!defined(%default_config_raw)) { # read default only once if persistent mode
|
|
- readconf(\%default_config, \%default_config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
|
|
+ readconf(\%default_config, \%default_config_raw, "/var/www/conf/openwebmail/openwebmail.conf.default");
|
|
}
|
|
%config=%default_config; %config_raw =%default_config_raw;
|
|
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf") if (-f "$SCRIPT_DIR/etc/openwebmail.conf");
|
|
+ readconf(\%config, \%config_raw, "/var/www/conf/openwebmail/openwebmail.conf") if (-f "/var/www/conf/openwebmail/openwebmail.conf");
|
|
readlang($config{'default_language'}); # so %lang... can be used in error msg
|
|
|
|
if ($config{'smtpauth'}) { # load smtp auth user/pass
|
|
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/smtpauth.conf");
|
|
+ readconf(\%config, \%config_raw, "/var/www/conf/openwebmail/smtpauth.conf");
|
|
if ($config{'smtpauth_username'} eq "" || $config{'smtpauth_password'} eq "") {
|
|
- openwebmailerror(__FILE__, __LINE__, "$SCRIPT_DIR/etc/smtpauth.conf $lang_err{'param_fmterr'}");
|
|
+ openwebmailerror(__FILE__, __LINE__, "/var/www/conf/openwebmail/smtpauth.conf $lang_err{'param_fmterr'}");
|
|
}
|
|
}
|
|
|