cleanup
This commit is contained in:
		
							parent
							
								
									1b16ad9959
								
							
						
					
					
						commit
						959e991c67
					
				@ -449,8 +449,6 @@ int main(int argc, char *argv[], char *envp[])
 | 
				
			|||||||
	(void)debug_setfilename(log_getfilename(LOG_FILE_DEBUG));
 | 
						(void)debug_setfilename(log_getfilename(LOG_FILE_DEBUG));
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	printf("split_inb: %s\n", conf_boolean(cf_split_inbound)?"yes":"no");
 | 
					 | 
				
			||||||
	
 | 
					 | 
				
			||||||
	if( opts.daemon )
 | 
						if( opts.daemon )
 | 
				
			||||||
		rc = bforce_daemon(&opts);
 | 
							rc = bforce_daemon(&opts);
 | 
				
			||||||
	else if( role )
 | 
						else if( role )
 | 
				
			||||||
 | 
				
			|||||||
@ -317,10 +317,11 @@ int session_set_inbound(void)
 | 
				
			|||||||
		p_inb = "./";
 | 
							p_inb = "./";
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	if( conf_boolean(cf_split_inbound) ) {
 | 
						if( conf_boolean(cf_split_inbound) )
 | 
				
			||||||
		char buf[500];		
 | 
						{
 | 
				
			||||||
 | 
							char buf[PATH_MAX+31];
 | 
				
			||||||
		if( state.node.addr.point ) {
 | 
							if( state.node.addr.point ) {
 | 
				
			||||||
		    sprintf( buf, "%s%d:%d/%d.%d/%s-in/",
 | 
							    snprintf( buf, PATH_MAX, "%s%d:%d/%d.%d/%s-in/",
 | 
				
			||||||
			p_inb,
 | 
								p_inb,
 | 
				
			||||||
			state.node.addr.zone,
 | 
								state.node.addr.zone,
 | 
				
			||||||
			state.node.addr.net,
 | 
								state.node.addr.net,
 | 
				
			||||||
@ -328,7 +329,7 @@ int session_set_inbound(void)
 | 
				
			|||||||
			state.node.addr.point,
 | 
								state.node.addr.point,
 | 
				
			||||||
			state.protected? "pwd": "unchecked" );
 | 
								state.protected? "pwd": "unchecked" );
 | 
				
			||||||
		 } else {
 | 
							 } else {
 | 
				
			||||||
		    sprintf( buf, "%s%d:%d/%d/%s-in/",
 | 
							    snprintf( buf, PATH_MAX, "%s%d:%d/%d/%s-in/",
 | 
				
			||||||
			p_inb,
 | 
								p_inb,
 | 
				
			||||||
			state.node.addr.zone,
 | 
								state.node.addr.zone,
 | 
				
			||||||
			state.node.addr.net,
 | 
								state.node.addr.net,
 | 
				
			||||||
@ -337,9 +338,11 @@ int session_set_inbound(void)
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
		log("inbound: %s", buf);
 | 
							log("inbound: %s", buf);
 | 
				
			||||||
		state.inbound = (char*)xstrcpy(buf);
 | 
							state.inbound = (char*)xstrcpy(buf);
 | 
				
			||||||
		sprintf( buf, "/bin/mkdir -p %s -m 700", state.inbound );
 | 
							snprintf( buf, PATH_MAX+30, "/bin/mkdir -p %s -m 700", state.inbound ); /* 30 additional chars allowed */
 | 
				
			||||||
		system( buf );
 | 
							system( buf );
 | 
				
			||||||
	} else {
 | 
						}
 | 
				
			||||||
 | 
						else
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
		state.inbound = (char*)xstrcpy(p_inb);
 | 
							state.inbound = (char*)xstrcpy(p_inb);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user