23 lines
1.3 KiB
Plaintext
23 lines
1.3 KiB
Plaintext
$OpenBSD: patch-cgi-bin_openwebmail_ow-shared_pl,v 1.5 2003/11/13 05:55:56 kevlo Exp $
|
|
--- cgi-bin/openwebmail/ow-shared.pl.orig Sun Nov 9 10:06:44 2003
|
|
+++ cgi-bin/openwebmail/ow-shared.pl Thu Nov 13 10:40:47 2003
|
|
@@ -368,14 +368,14 @@
|
|
###################### USERENV_INIT ###################
|
|
# init user globals, switch euid
|
|
sub userenv_init {
|
|
- load_rawconf(\%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
|
|
- readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf");
|
|
+ load_rawconf(\%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
|
|
+ readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/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, "%%SYSCONFDIR%%/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__, "%%SYSCONFDIR%%/openwebmail/smtpauth.conf $lang_err{'param_fmterr'}");
|
|
}
|
|
}
|
|
|