[Openvas-commits] r1410 - in trunk/openvas-libraries: . libopenvas

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Sep 23 21:04:01 CEST 2008


Author: jan
Date: 2008-09-23 21:04:00 +0200 (Tue, 23 Sep 2008)
New Revision: 1410

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/libopenvas/plugutils.c
   trunk/openvas-libraries/libopenvas/scanners_utils.c
Log:
* libopenvas/scanners_utils.c(comm_send_status): Removed
conditional for ntp_11, because this is standard for otp.

* libopenvas/plugutils.c (scanner_add_port): Removed
conditional for ntp_11, because this is standard for otp.



Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2008-09-23 19:02:43 UTC (rev 1409)
+++ trunk/openvas-libraries/ChangeLog	2008-09-23 19:04:00 UTC (rev 1410)
@@ -1,3 +1,11 @@
+2008-09-23  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* libopenvas/scanners_utils.c(comm_send_status): Removed
+	conditional for ntp_11, because this is standard for otp.
+
+	* libopenvas/plugutils.c (scanner_add_port): Removed
+	conditional for ntp_11, because this is standard for otp.
+
 2008-09-23  Michael Wiegand <michael.wiegand at intevation.de>
 
 	Post release version bump.

Modified: trunk/openvas-libraries/libopenvas/plugutils.c
===================================================================
--- trunk/openvas-libraries/libopenvas/plugutils.c	2008-09-23 19:02:43 UTC (rev 1409)
+++ trunk/openvas-libraries/libopenvas/plugutils.c	2008-09-23 19:04:00 UTC (rev 1410)
@@ -1556,7 +1556,6 @@
  int port;
  char * proto;
 {
- ntp_caps* caps = arg_get_value(args, "NTP_CAPS");
  char * buf;
  const char *svc_name = nessus_get_svc_name(port, proto);
  const char * hn = plug_get_hostname(args);
@@ -1587,16 +1586,9 @@
  
  len = 255 + (hn ? strlen(hn):0) + strlen(svc_name);
  buf = emalloc(len);
- if(caps != NULL && caps->ntp_11)
-  snprintf(buf, len, "SERVER <|> PORT <|> %s <|> %s (%d/%s) <|> SERVER\n",
- 		hn,svc_name, port, proto);
- else
-  {
-   if(!strcmp(proto, "tcp"))
-     snprintf(buf, len, "SERVER <|> PORT <|> %s <|> %d <|> SERVER\n",
-  		hn, port);
-  }
-   
+ snprintf(buf, len, "SERVER <|> PORT <|> %s <|> %s (%d/%s) <|> SERVER\n",
+          hn,svc_name, port, proto);
+
  if(do_send)
  {
   soc = (int)arg_get_value(args, "SOCKET");

Modified: trunk/openvas-libraries/libopenvas/scanners_utils.c
===================================================================
--- trunk/openvas-libraries/libopenvas/scanners_utils.c	2008-09-23 19:02:43 UTC (rev 1409)
+++ trunk/openvas-libraries/libopenvas/scanners_utils.c	2008-09-23 19:04:00 UTC (rev 1410)
@@ -57,9 +57,7 @@
   short_status = 1;
  else
   short_status = 0;
-   
-  if(caps->ntp_11)
-    {
+
     if(short_status)
       {
       snprintf(buffer, sizeof(buffer), "s:%c:%s:%d:%d\n", action[0], hostname, curr, max);
@@ -68,12 +66,7 @@
      snprintf(buffer, sizeof(buffer),
 		"SERVER <|> STATUS <|> %s <|> %s <|> %d/%d <|> SERVER\n",
 		hostname, action, curr, max);
-    }
-  else
-   snprintf(buffer, sizeof(buffer), "SERVER <|> STAT <|> %s <|> %d/%d <|> SERVER\n",
-	      hostname, curr, max);
-	      
-	      
+
  internal_send(soc, buffer, INTERNAL_COMM_MSG_TYPE_DATA);
  
  return 0;



More information about the Openvas-commits mailing list