Fixed binkp incoming unprotected sessions

This commit is contained in:
Michiel Broek 2002-02-14 22:04:07 +00:00
parent 62f10ff407
commit 6e31daa907
4 changed files with 23 additions and 13 deletions

View File

@ -4618,3 +4618,6 @@ v0.33.20 10-Feb-2002
mbtask: mbtask:
Removed some debug logging. Removed some debug logging.
mbcico:
Fixed binkp driver to accept incoming unprotected sessions.

View File

@ -135,7 +135,7 @@ execute.o: libs.h structs.h clcomm.h common.h
expipe.o: libs.h structs.h clcomm.h common.h expipe.o: libs.h structs.h clcomm.h common.h
getheader.o: libs.h structs.h users.h records.h clcomm.h common.h getheader.o: libs.h structs.h users.h records.h clcomm.h common.h
mime.o: libs.h structs.h clcomm.h common.h mime.o: libs.h structs.h clcomm.h common.h
noderecord.o: libs.h structs.h users.h records.h dbnode.h common.h noderecord.o: libs.h structs.h common.h users.h records.h dbnode.h common.h
rfcaddr.o: libs.h structs.h users.h records.h clcomm.h common.h rfcaddr.o: libs.h structs.h users.h records.h clcomm.h common.h
strutil.o: libs.h structs.h common.h strutil.o: libs.h structs.h common.h
charconv_jp.o: libs.h structs.h common.h charconv_jp.o: libs.h structs.h common.h
@ -148,7 +148,7 @@ dbcfg.o: libs.h mbse.h structs.h users.h records.h dbcfg.h
dbdupe.o: libs.h structs.h clcomm.h dbdupe.h dbdupe.o: libs.h structs.h clcomm.h dbdupe.h
dbftn.o: libs.h structs.h users.h records.h dbcfg.h dbftn.h dbftn.o: libs.h structs.h users.h records.h dbcfg.h dbftn.h
dbmsgs.o: libs.h structs.h users.h records.h clcomm.h dbcfg.h dbmsgs.h dbmsgs.o: libs.h structs.h users.h records.h clcomm.h dbcfg.h dbmsgs.h
dbnode.o: libs.h structs.h users.h records.h clcomm.h dbcfg.h dbnode.h dbnode.o: libs.h structs.h common.h users.h records.h clcomm.h dbcfg.h dbnode.h
dbtic.o: libs.h structs.h users.h records.h clcomm.h dbcfg.h dbtic.h dbtic.o: libs.h structs.h users.h records.h clcomm.h dbcfg.h dbtic.h
dbuser.o: libs.h structs.h users.h records.h dbcfg.h dbuser.h dbuser.o: libs.h structs.h users.h records.h dbcfg.h dbuser.h
jammsg.o: libs.h clcomm.h msgtext.h msg.h jam.h jammsg.h jammsg.o: libs.h clcomm.h msgtext.h msg.h jam.h jammsg.h

View File

@ -547,10 +547,10 @@ SM_STATE(authremote)
SM_STATE(ifsecure) SM_STATE(ifsecure)
if (SendPass) { // if (SendPass) {
SM_PROCEED(waitok) SM_PROCEED(waitok)
} // }
SM_SUCCESS; // SM_SUCCESS;
SM_STATE(waitok) SM_STATE(waitok)
@ -562,7 +562,10 @@ SM_STATE(waitok)
if (cmd) { if (cmd) {
if (rbuf[0] == MM_OK) { if (rbuf[0] == MM_OK) {
Syslog('+', "Password protected session"); if (SendPass)
Syslog('+', "Password protected BINKP session");
else
Syslog('+', "Unprotected BINKP session");
SM_SUCCESS; SM_SUCCESS;
} else if (rbuf[0] == MM_BSY) { } else if (rbuf[0] == MM_BSY) {
@ -705,10 +708,10 @@ SM_STATE(waitaddr)
SM_STATE(ispasswd) SM_STATE(ispasswd)
if (!Loaded && !strlen(nodes.Epasswd)) { // if (!Loaded && !strlen(nodes.Epasswd)) {
Syslog('+', "Unprotected session"); // Syslog('+', "Unprotected session");
SM_SUCCESS; // SM_SUCCESS;
} // }
SM_PROCEED(waitpwd) SM_PROCEED(waitpwd)
SM_STATE(waitpwd) SM_STATE(waitpwd)
@ -734,7 +737,11 @@ SM_STATE(waitpwd)
} }
SM_STATE(pwdack) SM_STATE(pwdack)
if (strcmp(&rbuf[1], nodes.Epasswd) == 0) { if ((strcmp(&rbuf[1], "-") == 0) && (!Loaded && !strlen(nodes.Epasswd))) {
Syslog('+', "No password, unprotected BINKP session");
binkp_send_control(MM_OK, "");
SM_SUCCESS;
} else if (strcmp(&rbuf[1], nodes.Epasswd) == 0) {
Syslog('+', "Password OK, protected BINKP session"); Syslog('+', "Password OK, protected BINKP session");
if (inbound) if (inbound)
free(inbound); free(inbound);

View File

@ -187,7 +187,7 @@ hash.o: ../lib/libs.h hash.h lhash.h
mbaff.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h announce.h filefind.h mbaff.h mbaff.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h announce.h filefind.h mbaff.h
mbseq.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbseq.h mbseq.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbseq.h
notify.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbnode.h filemgr.h areamgr.h sendmail.h notify.h notify.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbnode.h filemgr.h areamgr.h sendmail.h notify.h
postnetmail.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/dbcfg.h ../lib/dbuser.h ../lib/dbnode.h ../lib/dbftn.h ../lib/common.h ../lib/clcomm.h tracker.h addpkt.h storenet.h ftn2rfc.h areamgr.h filemgr.h ping.h bounce.h postemail.h postnetmail.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/common.h ../lib/records.h ../lib/dbcfg.h ../lib/dbuser.h ../lib/dbnode.h ../lib/dbftn.h ../lib/clcomm.h tracker.h addpkt.h storenet.h ftn2rfc.h areamgr.h filemgr.h ping.h bounce.h postemail.h
scannews.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h mkftnhdr.h hash.h rollover.h pack.h storeecho.h rfc2ftn.h scannews.h scannews.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h mkftnhdr.h hash.h rollover.h pack.h storeecho.h rfc2ftn.h scannews.h
tosspkt.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h tosspkt.h postnetmail.h postecho.h rollover.h createm.h tosspkt.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h tosspkt.h postnetmail.h postecho.h rollover.h createm.h
mbfkill.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfkill.h mbfutil.h mbfkill.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfkill.h mbfutil.h