* 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 bc33eae9641b5352f48738e580bb4a43e01fabb9..f2205b687b6d26177f05f621ccc39a32c6d8bd24 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -880,9 +880,7 @@ 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 mailname[256];
 
        char cmdbuf[SIZ];
 
@@ -898,26 +896,20 @@ void check_get(void) {
 
        if (strcasecmp(cmdbuf, "GET "));
        {
-               struct ctdlroom tempQR;
-
+               struct recptypes *rcpt;
                char *argbuf = &cmdbuf[4];
-               //// if (CtdlAccessCheck(ac_logged_in)) return;
                
                extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
-               extract_token(mailname, internet_addr, 1, '|', sizeof mailname);
-               
-               if (CtdlDirectoryLookup(citadel_addr, internet_addr, sizeof citadel_addr) == 0) {
-                       cprintf("200 OK %s\n", internet_addr);
-                       lprintf(CTDL_INFO, "sending 200 OK %s\n", internet_addr);
-               }
-               else if (alias(internet_addr)!=MES_ERROR){
-                       cprintf("200 OK %s\n", internet_addr);
-                       lprintf(CTDL_INFO, "sending 200 OK for the alias %s\n", internet_addr);
-               }
-               else if ( (!strncasecmp(mailname, "room_", 5))
-                         && (!getroom(&tempQR, mailname)) ) {
+               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", internet_addr);
+                       lprintf(CTDL_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp);
                }
                else 
                {
@@ -925,6 +917,7 @@ void check_get(void) {
                        
                        lprintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr);
                }
+               if (rcpt != NULL) free (rcpt);
        }
 ///    CC->kill_me = 1;
 }