* added message subject to all those tiny messages

[citadel.git] / citadel / serv_vcard.c

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 8ece90f2f357ff35107c8a3183cfdae9837ec128..f2205b687b6d26177f05f621ccc39a32c6d8bd24 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -880,7 +880,6 @@ void cmd_qdir(char *argbuf) {
  * Query Directory, in fact an alias to match postfix tcp auth.
  */
 void check_get(void) {
-       char citadel_addr[256];
        char internet_addr[256];
 
        char cmdbuf[SIZ];
@@ -897,23 +896,28 @@ void check_get(void) {
 
        if (strcasecmp(cmdbuf, "GET "));
        {
-
+               struct recptypes *rcpt;
                char *argbuf = &cmdbuf[4];
-               //// if (CtdlAccessCheck(ac_logged_in)) return;
                
                extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
-               
-               if (CtdlDirectoryLookup(citadel_addr, internet_addr, sizeof citadel_addr) != 0) {
-                       cprintf("500 REJECT noone here by that name.\n");
-                       
-                       lprintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr);
+               rcpt = validate_recipients(internet_addr);
+               if ((rcpt != NULL)&&
+                       (
+                        (*rcpt->recp_local != '\0')||
+                        (*rcpt->recp_room != '\0')||
+                        (*rcpt->recp_ignet != '\0')))
+               {
+
+                       cprintf("200 OK %s\n", internet_addr);
+                       lprintf(CTDL_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp);
                }
-               
                else 
                {
-                       cprintf("200 OK %s\n", internet_addr);//,citadel_addr);
-                       lprintf(CTDL_INFO, "sending 200 OK %s\n", internet_addr);//,citadel_addr);
+                       cprintf("500 REJECT noone here by that name.\n");
+                       
+                       lprintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr);
                }
+               if (rcpt != NULL) free (rcpt);
        }
 ///    CC->kill_me = 1;
 }