Wed Nov 11 17:57:39 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
* citserver.c: slight changes to cmd_rchg() and cmd_hchg() [crashes]
+ * citserver.c, msgbase.c, user_ops.c: hide the owner-prefix of mail
+ rooms in a couple more places: set_wtmpsupp() and make_message()
1998-11-11 Nathan Bryant <bryant@cs.usm.maine.edu>
* serv_upgrade.c: fix uninitialized variable
strcpy(recp, "");
}
else {
- strcpy(targetroom, "Mail");
+ strcpy(targetroom, MAILROOM);
}
time(&now);
fprintf(temp, "O%s%c", targetroom, 0);
}
else {
- fprintf(temp, "OMail%c", 0);
+ fprintf(temp, "O%s%c", MAILROOM, 0);
}
fprintf(temp,"N%s%c", nodebuf, 0);
}
+/*
+ * call set_wtmpsupp() with the name of the current room, modified a bit...
+ */
+void set_wtmpsupp_to_current_room() {
+ if (CC->quickroom.QRflags & QR_PRIVATE) {
+ set_wtmpsupp("<private room>");
+ }
+ else if (CC->quickroom.QRflags & QR_MAILBOX) {
+ set_wtmpsupp(&CC->quickroom.QRname[11]);
+ }
+ else {
+ set_wtmpsupp(CC->quickroom.QRname);
+ }
+ }
+
+
+
/*
* cmd_info() - tell the client about this server
*/
strncpy(CC->cs_host,from_host,24);
CC->cs_host[24] = 0;
}
- set_wtmpsupp(CC->quickroom.QRname);
+ set_wtmpsupp_to_current_room();
syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
dev_code,
CC->cs_flags = CC->cs_flags|CS_STEALTH;
}
- set_wtmpsupp(CC->quickroom.QRname);
+ set_wtmpsupp_to_current_room();
cprintf("%d Ok\n",OK);
}
void master_cleanup (void);
void cleanup_stuff (void *arg);
void set_wtmpsupp (char *newtext);
+void set_wtmpsupp_to_current_room(void);
void cmd_info (void);
void cmd_rchg (char *newroomname);
void cmd_hchg (char *newhostname);
/* Don't confuse the poor folks if it's not routed mail. */
strcpy(dest_node, "");
+
/* If net_type is M_BINARY, split out the destination node. */
if (net_type == M_BINARY) {
strcpy(dest_node,NODENAME);
fprintf(fp,"A%s%c",fake_name,0);
else
fprintf(fp,"A%s%c",author->fullname,0); /* author */
- fprintf(fp,"O%s%c",CC->quickroom.QRname,0); /* room */
+
+ if (CC->quickroom.QRflags & QR_MAILBOX) { /* room */
+ fprintf(fp,"O%s%c", &CC->quickroom.QRname[11], 0);
+ }
+ else {
+ fprintf(fp,"O%s%c",CC->quickroom.QRname,0);
+ }
+
fprintf(fp,"N%s%c",NODENAME,0); /* nodename */
fprintf(fp,"H%s%c",HUMANNODE,0); /* human nodename */
else {
purge = 0;
}
+
+ /*
lprintf(9, "U/R REL: <%s> <%ld> <%ld> <%d> %s\n",
visits[a].v_roomname,
visits[a].v_generation,
visits[a].v_lastseen,
visits[a].v_flags,
(purge ? "**purging**" : "") );
+ */
if (purge) {
memcpy(&visits[a], &visits[a+1],