[Linux-decnet-commit] CVS: dnprogs/libdaemon dnet_daemon.c, 1.17, 1.18

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

Update of /cvsroot/linux-decnet/dnprogs/libdaemon
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30442/libdaemon

Modified Files:
	dnet_daemon.c 
Log Message:
changed dnetd.confs auth field into an option field, still need to update the docs

Index: dnet_daemon.c
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/libdaemon/dnet_daemon.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** dnet_daemon.c	10 Nov 2008 17:54:42 -0000	1.17
--- dnet_daemon.c	11 Nov 2008 08:24:16 -0000	1.18
***************
*** 77,80 ****
--- 77,81 ----
      char  user[USERNAME_LENGTH]; // User to use if proxies not used
      char  daemon[PATH_MAX];      // Name of daemon
+     int   auto_accept;           // Auto Accept incoming connections
  
      struct object *next;
***************
*** 695,698 ****
--- 696,715 ----
  	    case 3:
  		newobj->proxy = (toupper(bufp[0])=='Y'?TRUE:FALSE);
+ 		newobj->auto_accept = 0;
+ 		if ( bufp[1] == ',' && bufp[2] != ' ' && bufp[2] != '\t' ) {
+ 		    switch (toupper(bufp[2])) {
+ 			case 'Y':
+ 			case 'A':
+ 			    newobj->auto_accept =  1;
+ 			    break;
+ 			case 'R':
+ 			    newobj->auto_accept = -1;
+ 			    break;
+ 			case 'N':
+ 			default:
+ 			    newobj->auto_accept =  0;
+ 			    break;
+ 		    }
+ 		}
  		break;
  	    case 4:
***************
*** 940,943 ****
--- 957,961 ----
  	int fork_fail = 0;
  	int newone;
+ 	int ret;
  
  	// Wait for a new connection.
***************
*** 946,950 ****
  	{
  	    if (!object_db) load_dnetd_conf();
! 	    switch (fork_and_setuid(newone))
  	    {
  	    case -1:
--- 964,981 ----
  	{
  	    if (!object_db) load_dnetd_conf();
! 	    ret = fork_and_setuid(newone);
! 
! 	    if (object_db) {
! 		switch (thisobj->auto_accept) {
! 		    case  1:
! 			dnet_accept(newone, 0, NULL, 0);
! 			break;
! 		    case -1:
! 			dnet_reject(newone, DNSTAT_REJECTED, NULL, 0);
! 			continue;
! 		}
! 	    }
! 
! 	    switch (ret)
  	    {
  	    case -1: