/tags/1.2.2.1-7/debian/patches/welcome_is_template.patch |
---|
29,3 → 29,13 |
# Location of icon files |
icon_dir = "$prefix/icons" |
--- a/shared/config.c |
+++ b/shared/config.c |
@@ -2139,7 +2139,6 @@ BOOL config_check(struct config * config |
struct config_http_port *chp; |
char hostname[MAX_ADDRESS+1], domainname[MAX_ADDRESS+1]; |
- TEST_STRING(config->help_dir, "help_dir"); |
TEST_STRING(config->icon_dir, "icon_dir"); |
TEST_STRING(config->socket_dir, "socket_dir"); |
TEST_STRING(config->init_socket_name, "init_socket_name"); |
/tags/1.2.2.1-7/debian/patches/usernames_with_at.patch |
---|
0,0 → 1,53 |
--- a/session/draft.c |
+++ b/session/draft.c |
@@ -1399,10 +1399,12 @@ char *draft_make_msg(struct draft *draft |
if (draft->from_address && draft->from_address[0]) { |
from_address = draft->from_address; |
use_sender = T; |
- } else |
- from_address |
- = |
+ } else if (strchr(session->username, '@')) { |
+ from_address = pool_strdup(pool, session->username); |
+ } else { |
+ from_address = |
pool_printf(pool, "%s@%s", session->username, default_domain); |
+ } |
if (draft->from_personal && draft->from_personal[0]) { |
from_personal = draft->from_personal; |
@@ -1431,9 +1433,14 @@ char *draft_make_msg(struct draft *draft |
NIL); |
bputs(mb, "" CRLF); |
- if (use_sender) |
- bprintf(mb, "Sender: %s@%s" CRLF, session->username, |
- default_domain); |
+ if (use_sender) { |
+ if (strchr(session->username, '@')) { |
+ bprintf(mb, "Sender: %s" CRLF, session->username); |
+ } else { |
+ bprintf(mb, "Sender: %s@%s" CRLF, session->username, |
+ default_domain); |
+ } |
+ } |
if (!(draft_make_abook_address(session, mb, "To", draft->to) && |
draft_make_abook_address(session, mb, "Cc", draft->cc) && |
--- a/cmd/cmd_prefs.c |
+++ b/cmd/cmd_prefs.c |
@@ -474,9 +474,12 @@ generate_compose1_form(struct session *s |
template_vals_string(tvals, "from_address", prefs->from_address); |
if (!(prefs->from_address && prefs->from_address[0])) { |
- char *s = pool_printf(request->pool, "%s@%s", |
- session->username, prefs->default_domain); |
+ char *s = session->username; |
+ if (!strchr(session->username, '@')) { |
+ s = pool_printf(request->pool, "%s@%s", |
+ session->username, prefs->default_domain); |
+ } |
template_vals_string(tvals, "default_from_address", s); |
} |
/tags/1.2.2.1-7/debian/patches/makefile_install_config.patch |
---|
125,10 → 125,10 |
# Various directories used by the running system |
# Logs stored in $log_dir |
-log_dir = "$var_prefix/logs" |
+log_dir = "/var/log/prayer" |
- |
-# $lock_dir used for interlocking between prayer processes |
-lock_dir = "$var_prefix/locks" |
+log_dir = "/var/log/prayer" |
# $socket_dir is location for unix domain sockets which connect frontend |
# to backend in proxy mode of operation. |
141,13 → 141,9 |
# Name of Unix domain socket (in $socket_dir) used for initial handshake |
# between prayer and prayer-session processes when a user logs in |
@@ -453,10 +438,10 @@ ssl_session_dir = "$var_prefix/ssl_s |
@@ -453,7 +438,7 @@ ssl_session_dir = "$var_prefix/ssl_s |
tmp_dir = "$var_prefix/tmp" |
# Location for temporary files e.g; attachments and folders in transist |
# during upload and download operation. Core files also end up here |
-tmp_dir = "$var_prefix/tmp" |
+tmp_dir = "/tmp" |
# Location for PID files for prayer and prayer-session master processes. |
-pid_dir = "$var_prefix/pid" |
+pid_dir = "$var_prefix" |
172,3 → 168,13 |
# Size of small and large compose windows |
small_cols = 80 |
--- a/shared/config.c |
+++ b/shared/config.c |
@@ -2144,7 +2144,6 @@ BOOL config_check(struct config * config |
TEST_STRING(config->socket_dir, "socket_dir"); |
TEST_STRING(config->init_socket_name, "init_socket_name"); |
TEST_STRING(config->ssl_session_dir, "ssl_session_dir"); |
- TEST_STRING(config->lock_dir, "lock_dir"); |
TEST_STRING(config->log_dir, "log_dir"); |
TEST_STRING(config->tmp_dir, "tmp_dir"); |
TEST_STRING(config->pid_dir, "pid_dir"); |
/tags/1.2.2.1-7/debian/patches/unlimit_login_username.patch |
---|
0,0 → 1,11 |
--- a/servers/prayer_login.c |
+++ b/servers/prayer_login.c |
@@ -116,7 +116,7 @@ prayer_login_generate(struct prayer *pra |
bputs(b, " <td>"); |
bprintf(b, |
- "<input name=\"username\" value=\"%s\" size=\"8\" maxlength=\"8\" />", |
+ "<input name=\"username\" value=\"%s\" size=\"16\" />", |
user ? user : ""); |
bputs(b, "</td>" CRLF); |
bputs(b, "</tr>" CRLF); |
/tags/1.2.2.1-7/debian/patches/series |
---|
4,3 → 4,5 |
welcome_is_template.patch |
templates_fallback_to_compiled.patch |
template_find_bug.patch |
unlimit_login_username.patch |
usernames_with_at.patch |