Remove the deprecated "Default Outbound FidoNet NetMail Address"

option.

src/sbbs3/scfg/scfgnet.c

@@ -50,7 +50,8 @@ bool new_qhub(unsigned new_qhubnum)
 
 	qhub_t** new_qhub_list = realloc(cfg.qhub, sizeof(qhub_t*) * (cfg.total_qhubs + 1));
 	if(new_qhub_list == NULL) {
-		/* ToDo: report error */
+		free(new_qhub);
+		errormsg(WHERE, ERR_ALLOC, "qhub list", cfg.total_qhubs + 1);
 		return false;
 	}
 	cfg.qhub = new_qhub_list;
@@ -285,10 +286,6 @@ void net_cfg()
 				sprintf(opt[i++],"%-27.27s%s"
 					,"System Addresses",cfg.total_faddrs
                 		? smb_faddrtoa(&cfg.faddr[0],tmp) : nulstr);
-				sprintf(opt[i++],"%-27.27s%s"
-					,"Default Outbound Address"
-					,cfg.dflt_faddr.zone
-                		? smb_faddrtoa(&cfg.dflt_faddr,tmp) : "No");
 				sprintf(opt[i++],"%-27.27s"
 					,"Default Origin Line");
 				sprintf(opt[i++],"%-27.27s%.40s"
@@ -406,44 +403,6 @@ void net_cfg()
 						}
 						break;
 					case 1:
-						i=0;
-						uifc.helpbuf=
-							"`Use Default Outbound NetMail Address:`\n"
-							"\n"
-							"If you would like to have a default FidoNet address adding to outbound\n"
-							"NetMail mail messages that do not have an address specified, select\n"
-							"`Yes`.\n"
-						;
-						i=uifc.list(WIN_MID|WIN_SAV,0,0,0,&i,0
-							,"Use Default Outbound NetMail Address",uifcYesNoOpts);
-						if(i==1) {
-							if(cfg.dflt_faddr.zone)
-								uifc.changes=1;
-							cfg.dflt_faddr.zone=0;
-							break; 
-						}
-						if(i==-1)
-							break;
-						if(!cfg.dflt_faddr.zone) {
-							cfg.dflt_faddr.zone=1;
-							uifc.changes=1; 
-						}
-						smb_faddrtoa(&cfg.dflt_faddr,str);
-						uifc.helpbuf=
-							"`Default Outbound FidoNet NetMail Address:`\n"
-							"\n"
-							"If you would like to automatically add a FidoNet address to outbound\n"
-							"NetMail that does not have an address specified, set this option\n"
-							"to that address. This is useful for Fido/UUCP gateway mail.\n"
-							"Format: `Zone:Net/Node[.Point]`\n"
-						;
-						if(uifc.input(WIN_MID|WIN_SAV,0,0,"Outbound Address"
-							,str,25,K_EDIT)) {
-							cfg.dflt_faddr=atofaddr(str);
-							uifc.changes=1; 
-						}
-						break;
-					case 2:
 						uifc.helpbuf=
 							"`Default Origin Line:`\n"
 							"\n"
@@ -454,7 +413,7 @@ void net_cfg()
 						uifc.input(WIN_MID|WIN_SAV,0,0,"* Origin"
 							,cfg.origline,sizeof(cfg.origline)-1,K_EDIT);
 						break;
-					case 3:
+					case 2:
 						uifc.helpbuf=
 							"`NetMail Semaphore File:`\n"
 							"\n"
@@ -465,7 +424,7 @@ void net_cfg()
 						uifc.input(WIN_MID|WIN_SAV,0,0,"NetMail Semaphore"
 							,cfg.netmail_sem,sizeof(cfg.netmail_sem)-1,K_EDIT);
 						break;
-					case 4:
+					case 3:
 						uifc.helpbuf=
 							"`EchoMail Semaphore File:`\n"
 							"\n"
@@ -476,7 +435,7 @@ void net_cfg()
 						uifc.input(WIN_MID|WIN_SAV,0,0,"EchoMail Semaphore"
 							,cfg.echomail_sem,sizeof(cfg.echomail_sem)-1,K_EDIT);
 						break;
-					case 5:
+					case 4:
 						uifc.helpbuf=
 							"`NetMail Directory:`\n"
 							"\n"
@@ -486,7 +445,7 @@ void net_cfg()
 						uifc.input(WIN_MID|WIN_SAV,0,0,"NetMail"
 							,cfg.netmail_dir,sizeof(cfg.netmail_dir)-1,K_EDIT);
 						break;
-					case 6:
+					case 5:
 						i=0;
 						uifc.helpbuf=
 							"`Allow Users to Send NetMail:`\n"
@@ -505,7 +464,7 @@ void net_cfg()
 							cfg.netmail_misc&=~NMAIL_ALLOW; 
 						}
 						break;
-					case 7:
+					case 6:
 						i=0;
 						uifc.helpbuf=
 							"`Allow Users to Send NetMail File Attachments:`\n"
@@ -524,7 +483,7 @@ void net_cfg()
 							cfg.netmail_misc&=~NMAIL_FILE; 
 						}
 						break;
-					case 8:
+					case 7:
 						i=1;
 						uifc.helpbuf=
 							"`Use Aliases in NetMail:`\n"
@@ -545,7 +504,7 @@ void net_cfg()
 							cfg.netmail_misc&=~NMAIL_ALIAS; 
 						}
 						break;
-					case 9:
+					case 8:
 						i=1;
 						uifc.helpbuf=
 							"`NetMail Defaults to Crash Status:`\n"
@@ -564,7 +523,7 @@ void net_cfg()
 							cfg.netmail_misc&=~NMAIL_CRASH; 
 						}
 						break;
-					case 10:
+					case 9:
 						i=1;
 						uifc.helpbuf=
 							"`NetMail Defaults to Direct Status:`\n"
@@ -583,7 +542,7 @@ void net_cfg()
 							cfg.netmail_misc&=~NMAIL_DIRECT; 
 						}
 						break;
-					case 11:
+					case 10:
 						i=1;
 						uifc.helpbuf=
 							"`NetMail Defaults to Hold Status:`\n"
@@ -602,7 +561,7 @@ void net_cfg()
 							cfg.netmail_misc&=~NMAIL_HOLD; 
 						}
 						break;
-					case 12:
+					case 11:
 						i=0;
 						uifc.helpbuf=
 							"`Kill NetMail After it is Sent:`\n"
@@ -621,7 +580,7 @@ void net_cfg()
 							cfg.netmail_misc&=~NMAIL_KILL; 
 						}
 						break;
-					case 13:
+					case 12:
 						ultoa(cfg.netmail_cost,str,10);
 						uifc.helpbuf=
 							"`Cost in Credits to Send NetMail:`\n"