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

[scm-commit@wald.intevation.org]

Author: jan
Date: 2008-09-22 14:10:50 +0200 (Mon, 22 Sep 2008)
New Revision: 1392

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/libopenvas/ntp.h
   trunk/openvas-libraries/libopenvas/plugutils.c
Log:
* libopenvas/plugutils.c (proto_post_wrapped): escape_crlf is
now standard with OTP 1.0.
Removed unused variables caps and t.

* libopenvas/ntp.h: Removed elements "plugins_xrefs",
"plugins_bugtraq_id", "md5_by_name", "fast_login",
"dependencies", "plugins_cve_id", "ciphered", "escape_crlf"
and "timestamps" from struct ntp_caps.
Removed defines for NTP_10, NTP_11 and NTP_12.



Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2008-09-22 11:02:50 UTC (rev 1391)
+++ trunk/openvas-libraries/ChangeLog	2008-09-22 12:10:50 UTC (rev 1392)
@@ -1,3 +1,15 @@
+2008-09-22  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* libopenvas/plugutils.c (proto_post_wrapped): escape_crlf is
+	now standard with OTP 1.0.
+	Removed unused variables caps and t.
+
+	* libopenvas/ntp.h: Removed elements "plugins_xrefs",
+	"plugins_bugtraq_id", "md5_by_name", "fast_login",
+	"dependencies", "plugins_cve_id", "ciphered", "escape_crlf"
+	and "timestamps" from struct ntp_caps.
+	Removed defines for NTP_10, NTP_11 and NTP_12.
+
 2008-09-19  Michael Wiegand <michael.wiegand at intevation.de>
 
 	Added support for new LOG and DEBUG messages.

Modified: trunk/openvas-libraries/libopenvas/ntp.h
===================================================================
--- trunk/openvas-libraries/libopenvas/ntp.h	2008-09-22 11:02:50 UTC (rev 1391)
+++ trunk/openvas-libraries/libopenvas/ntp.h	2008-09-22 12:10:50 UTC (rev 1392)
@@ -26,14 +26,12 @@
 #ifndef _OPENVAS_NTP_H
 #define _OPENVAS_NTP_H
 
-#define NTP_10 10   /* NTP/1.0 */
-#define NTP_11 11   /* NTP/1.1 */
-#define NTP_12 12   /* NTP/1.2 */
-#define ONTP_13 13   /* ONTP/1.3 */
+#define OTP_10 100  /* OTP/1.0 */
 
+/* Those marked a "deprecated" can be removed, once openvas-libraries
+ * is branched for 1.1  */
 typedef struct {
   int ntp_version; /*  NTP_VERSION, as defined in ntp.h */
-  int ciphered:1;  /*  TRUE, if we are using encryption */
   int ntp_11:1;    /*  TRUE, if we may use NTP 1.1 features; should
                        better be splitted into different capability
                        attributes, but this one simplifies the step
@@ -43,8 +41,6 @@
                        contain scan ID's. */
   int pubkey_auth:1; /* TRUE if the client wants to use public key
                         authentification */
-  int escape_crlf:1; /* TRUE if the client wants us to escape CRLF
-                        (they will be replaced by ';' if set to FALSE) */
 
   int md5_caching:1; /* TRUE if the client does not want us to send the
                         list of plugins directly, but just the md5 
@@ -52,19 +48,8 @@
 
   int plugins_version:1; /* TRUE if the client wants us to send the versions
                             of our plugins */
-
-  int timestamps:1; /* TRUE if the client wants us to send timestamps
-                       regarding the start and end of the whole scan
-                       and of each server (msg TIME) */
   int plugins_oid:1; /* the OID of the plugins along with their version */
-  int plugins_cve_id:1; /* the CVE ID of the plugins along with their version */
-
   int dns:1; /* send the host name and host ip */
-  int dependencies:1; /* send the list of plugins dependencies */
-  int fast_login:1;
-  int md5_by_name:1;
-  int plugins_bugtraq_id:1;
-  int plugins_xrefs:1;
 } ntp_caps;
 
 #endif

Modified: trunk/openvas-libraries/libopenvas/plugutils.c
===================================================================
--- trunk/openvas-libraries/libopenvas/plugutils.c	2008-09-22 11:02:50 UTC (rev 1391)
+++ trunk/openvas-libraries/libopenvas/plugutils.c	2008-09-22 12:10:50 UTC (rev 1392)
@@ -1016,13 +1016,10 @@
  const char * action;
  const char * what;
 {
-
- char *t;
  char * buffer;
  int soc;
  char * naction;
  int len;
- ntp_caps* caps = arg_get_value(desc, "NTP_CAPS");
  char * cve;
  char * bid;
  char * xref;
@@ -1048,11 +1045,7 @@
 	
  if(xref != NULL )
  	len += strlen(xref) + 20;
-	
- if( caps == NULL )
- 	return;
 
- 
  naction = emalloc(len+1);
  strncpy(naction, action, strlen(action));
  strcat(naction, "\n");
@@ -1076,9 +1069,6 @@
 	strcat(naction, "\n");
 	}
  
- if( caps->escape_crlf == 0 )
-   while((t=strchr(naction, '\n'))||(t=strchr(naction, '\r')))t[0]=';';
- else
   {
    char * old = naction;
    len -= strlen(naction);