srvx-commits

[Miles P. <pet...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv26977

Modified Files:
      Tag: rel-1_0
	opserv.c 
Log Message:
oops


Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.187.2.43
retrieving revision 1.187.2.44
diff -C2 -r1.187.2.43 -r1.187.2.44
*** opserv.c	2001/08/12 04:36:50	1.187.2.43
--- opserv.c	2001/08/12 22:49:47	1.187.2.44
***************
*** 1687,1691 ****
  
   	if (getipbyname(scanhost, &addr)) {
! 	    sockcheck_queue_address(addr, scanhost);
  	    opserv_notice(user, OSMSG_ADDRESS_QUEUED, scanhost);
  	} else {
--- 1687,1691 ----
  
   	if (getipbyname(scanhost, &addr)) {
! 	    sockcheck_queue_address(addr, intoa(addr));
  	    opserv_notice(user, OSMSG_ADDRESS_QUEUED, scanhost);
  	} else {
***************
*** 1709,1725 ****
      for (n=1; n<argc; n++) {
          struct userNode *un = GetUserH(argv[n]);
!         char *hostname;
  
          if (!un) {
!             hostname = argv[n];
          } else {
!             hostname = un->hostname;
          }
! 	if ((i = sockcheck_uncache_host(hostname)) && i != (unsigned)-1) {
! 	    opserv_notice(user, OSMSG_HOST_CLEARED, hostname);
  	} else if (i == (unsigned)-1) {
! 	    opserv_notice(user, OSMSG_HOST_BUSY, hostname);
  	} else {
! 	    opserv_notice(user, OSMSG_HOST_NOTCLEARED, hostname);
  	}
      }
--- 1709,1732 ----
      for (n=1; n<argc; n++) {
          struct userNode *un = GetUserH(argv[n]);
! 	unsigned long addr;
  
          if (!un) {
!             if (!getipbyname(argv[n], &addr)) {
! 		opserv_notice(user, OSMSG_NO_SUCH_ADDRESS, argv[n]);
! 		return 0;
! 	    }
          } else {
!             if (!getipbyname(un->hostname, &addr)) {
! 		opserv_notice(user, OSMSG_NO_SUCH_ADDRESS, un->hostname);
! 		return 0;
! 	    }
          }
! 
! 	if ((i = sockcheck_uncache_host(intoa(addr))) && i != (unsigned)-1) {
! 	    opserv_notice(user, OSMSG_HOST_CLEARED, intoa(addr));
  	} else if (i == (unsigned)-1) {
! 	    opserv_notice(user, OSMSG_HOST_BUSY, intoa(addr));
  	} else {
! 	    opserv_notice(user, OSMSG_HOST_NOTCLEARED, intoa(addr));
  	}
      }
***************
*** 1926,1930 ****
  {
      if (user->ip) {
!         sockcheck_queue_address(htonl(user->ip), user->hostname);
      }
      return 0;
--- 1933,1937 ----
  {
      if (user->ip) {
!         sockcheck_queue_address(htonl(user->ip), intoa(htonl(user->ip)));
      }
      return 0;