[Linux-decnet-commit] CVS: dnprogs/libdaemon dnet_daemon.c, 1.20, 1.21

[ph3-der-loewe <ph3...@us...>]

Update of /cvsroot/linux-decnet/dnprogs/libdaemon
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2437

Modified Files:
	dnet_daemon.c 
Log Message:
fixed segfault by moving the auto accept/reject into the final child section

Index: dnet_daemon.c
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/libdaemon/dnet_daemon.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** dnet_daemon.c	5 Aug 2010 14:18:45 -0000	1.20
--- dnet_daemon.c	5 Aug 2010 14:48:07 -0000	1.21
***************
*** 993,1008 ****
  	    if (!object_db) load_dnetd_conf();
  
- 	    if (object_db) {
- 		// check if we are going to do auto accept or reject.
- 		switch (thisobj->auto_accept) {
- 		    case  1:
- 			dnet_accept(newone, 0, NULL, 0);
- 			break;
- 		    case -1:
- 			dnet_reject(newone, DNSTAT_REJECTED, NULL, 0);
- 			continue;
- 		}
- 	    }
- 
  	    ret = fork_and_setuid(newone);
  
--- 993,996 ----
***************
*** 1022,1025 ****
--- 1010,1025 ----
  
  	    case 0: // child
+ 		if (object_db) {
+ 		    // check if we are going to do auto accept or reject.
+ 		    switch (thisobj->auto_accept) {
+ 			case  1:
+ 			    dnet_accept(newone, 0, NULL, 0);
+ 			    break;
+ 			case -1:
+ 			    dnet_reject(newone, DNSTAT_REJECTED, NULL, 0);
+ 			    exit(101);
+ 			    break;
+ 		    }
+ 		}
  		return newone;
  		break;