Removed the VRFY and EXPN commands from our SMTP server

[citadel.git] / citadel / file_ops.c

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 926d7b357f700afa2143ada8d7b0ec982e3e91ca..a6cf80b7a087c8ef2d74b867d7a97811b10bf2dd 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -280,7 +280,7 @@ void cmd_netf(char *cmdbuf)
        putc(255, ofp);
        putc(MES_NORMAL, ofp);
        putc(0, ofp);
-       fprintf(ofp, "Pcit%ld", CC->user.usernum);
+       fprintf(ofp, "P%s", CC->user.fullname);
        putc(0, ofp);
        time(&now);
        fprintf(ofp, "T%ld", (long) now);
@@ -432,7 +432,7 @@ void cmd_oimg(char *cmdbuf)
                                 "%s/floor.%d.gif",
                                 ctdl_image_dir, which_floor);
        } else if (!strcasecmp(filename, "_roompic_")) {
-               assoc_file_name(pathname, sizeof pathname, &CC->room, "images");
+               assoc_file_name(pathname, sizeof pathname, &CC->room, ctdl_image_dir);
        } else {
                for (a = 0; a < strlen(filename); ++a) {
                        filename[a] = tolower(filename[a]);
@@ -576,7 +576,7 @@ void cmd_uimg(char *cmdbuf)
        }
 
        if ((!strcasecmp(basenm, "_roompic_")) && (is_room_aide())) {
-               assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, "images");
+               assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, ctdl_image_dir);
        }
 
        if (strlen(CC->upl_path) == 0) {
@@ -685,7 +685,7 @@ void cmd_ucls(char *cmd)
                snprintf(upload_notice, sizeof upload_notice,
                        "NEW UPLOAD: '%s'\n %s\n",
                        CC->upl_file, CC->upl_comment);
-               quickie_message(CC->curr_user, NULL, CC->room.QRname,
+               quickie_message(CC->curr_user, NULL, NULL, CC->room.QRname,
                                upload_notice, 0, NULL);
        } else {
                abort_upl(CC);