more tiny merge misses

diff --git a/citadel/context.c b/citadel/context.c
index 181d0347c87db600a9862d947130a4511fca7b13..cf8309e01fb8e329b624f4a3ed534f030f31c484 100644 (file)
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -588,7 +588,7 @@ void context_cleanup(void)
                rem = ptr->next;
                --num_sessions;
 
-               syslog(LOG_DEBUG, "context_cleanup(): Purging session #%d %s\n", ptr->cs_pid, ptr->ServiceName);
+               syslog(LOG_DEBUG, "context_cleanup(): purging session %d\n", ptr->cs_pid);
                RemoveContext(ptr);
                free (ptr);
                ptr = rem;

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 9115b1fb4ee611620824b2c5d7031ac1a7c479da..7506a1abf372267158b71c6f6a918247353bed8a 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -743,16 +743,20 @@ void network_spool_msg(long msgnum, void *userdata) {
 
                        /* else we won't modify the buffer, since the roomname is already here. */
 
-                       /* if we don't already have a 'reply to' field, put our roomname in. */
-                       if (msg->cm_fields['K'] == NULL) {
-                               msg->cm_fields['K'] = malloc(256);
-                               snprintf(msg->cm_fields['K'], 256,
-                                        "room_%s@%s", CC->room.QRname,
-                                        config.c_fqdn);
-                               for (i=0; msg->cm_fields['K'][i]; ++i) {
-                                       if (isspace(msg->cm_fields['K'][i])) {
-                                               msg->cm_fields['K'][i] = '_';
-                                       }
+                       /* Set the recipient of the list message to the
+                        * email address of the room itself.
+                        * FIXME ... I want to be able to pick any address
+                        */
+                       if (msg->cm_fields['R'] != NULL) {
+                               free(msg->cm_fields['R']);
+                       }
+                       msg->cm_fields['R'] = malloc(256);
+                       snprintf(msg->cm_fields['R'], 256,
+                               "room_%s@%s", CC->room.QRname,
+                               config.c_fqdn);
+                       for (i=0; msg->cm_fields['R'][i]; ++i) {
+                               if (isspace(msg->cm_fields['R'][i])) {
+                                       msg->cm_fields['R'][i] = '_';
                                }
                        }
 

diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index e18ebd0243c3655529c9a837cfd916893b67dd42..cec2f9bd0c1d21a1f1b3e3e65b4fac8e50318b1e 100644 (file)
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -1001,9 +1001,8 @@ CTDL_MODULE_INIT(smtp_client)
                CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
                CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
        }
-       
 #endif
-       /* return our Subversion id for the Log */
-       return "smtpclient";
+       /* return our module name for the log */
+       return "smtp";
 }
 

diff --git a/citadel/po/citadel-setup/fr.po b/citadel/po/citadel-setup/fr.po
index bab3fd8a48a0ce453060ec5d491bada8b66dd780..c8b8580038423559b4abedb78d5d11bdd9b08f1f 100644 (file)
--- a/citadel/po/citadel-setup/fr.po
+++ b/citadel/po/citadel-setup/fr.po
@@ -43,7 +43,7 @@ msgid ""
 "a default installation just leave it blank.If you specify a directory other "
 "than the default, you will need to\n"
 "specify the -h flag to the server when you start it up.\n"
-"note that it may not have a leading /\n"
+"note that it may not have a leading /"
 msgstr ""
 "Entrez le chemin complet du répertoire dans lequel se trouve\n"
 "l'installation de Citadel que vous créez ou mettez à jour. Si vous\n"