diff --git a/ChangeLog b/ChangeLog index ef5cfe48..67a4323f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4726,6 +4726,8 @@ v0.33.20 10-Feb-2002 Auto file area create implemented, it can use plain tagfiles or filegate.zxx formatted files. The mbfido web command now uses macro templates. + Areamgr uplink requests the sender name is now set to the + sysop's name, so he/she will get to read the responses. mbfile: The mbfile index command now creates the html pages using the diff --git a/lib/mbdiesel.c b/lib/mbdiesel.c index 32077e95..4185a979 100644 --- a/lib/mbdiesel.c +++ b/lib/mbdiesel.c @@ -199,11 +199,12 @@ void Cookie(void) char *fname; long recno, records; + MacroVars("F", "s", ""); fname = calloc(PATH_MAX, sizeof(char)); sprintf(fname, "%s/etc/oneline.data", getenv("MBSE_ROOT")); if ((olf = fopen(fname, "r")) == NULL) { - WriteError("$Can't open %s", fname); + WriteError("Can't open %s", fname); free(fname); return; } @@ -222,10 +223,10 @@ void Cookie(void) if (fread(&ol, olhdr.recsize, 1, olf) == 1) { MacroVars("F", "s", ol.Oneline); } else { - WriteError("Can't read %s", fname); + WriteError("Can't read record %d from %s", recno, fname); } } else { - WriteError("$Can't seek record %d in %s", recno, fname); + WriteError("Can't seek record %d in %s", recno, fname); } fclose(olf); free(fname); diff --git a/mbfido/mgrutil.c b/mbfido/mgrutil.c index 794e3434..7f4afaf1 100644 --- a/mbfido/mgrutil.c +++ b/mbfido/mgrutil.c @@ -295,7 +295,7 @@ int UplinkRequest(faddr *t, int FileMgr, char *cmd) fidoaddr Orig, Dest; faddr From; unsigned flags = M_PVT; - char ext[4], *mgrname, *bymgr, *subj; + char ext[4], *mgrname, *subj; int i; From = *bestaka_s(t); @@ -324,14 +324,12 @@ int UplinkRequest(faddr *t, int FileMgr, char *cmd) return 2; } mgrname = xstrcpy(nodes.UplFmgrPgm); - bymgr = xstrcpy((char *)"FileMgr"); } else { if (strlen(nodes.UplAmgrPgm) == 0) { Syslog('!', "AreaMgr program not defined in setup of node %s", aka2str(Dest)); return 2; } mgrname = xstrcpy(nodes.UplAmgrPgm); - bymgr = xstrcpy((char *)"AreaMgr"); } if (strlen(nodes.Apasswd) == 0) { @@ -366,7 +364,7 @@ int UplinkRequest(faddr *t, int FileMgr, char *cmd) if ((qp = OpenPkt(Orig, Dest, (char *)ext)) == NULL) return 4; - if (AddMsgHdr(qp, &From, t, flags, 0, Now, mgrname, bymgr, subj)) { + if (AddMsgHdr(qp, &From, t, flags, 0, Now, mgrname, CFG.sysop_name, subj)) { fclose(qp); return 4; } @@ -399,7 +397,6 @@ int UplinkRequest(faddr *t, int FileMgr, char *cmd) fclose(qp); free(mgrname); - free(bymgr); free(subj); net_out++; return 0;