Re: nessus-libraries/libnessus store.c, 1.28.2.5, 1.28.2.6

Hi,

This commit happened only to NESSUS_2_2 branch.

I must admit I do not fully understand what it fixes,
but probably it should be applied to HEAD as well?

For convenience I attached a diff between the
current store.c in NESSUS_2_2 and in HEAD.

Best

	Jan

On Tue, Jul 05, 2005 at 11:14:51AM -0400, [email protected] wrote:
> Update of /usr/local/cvs/nessus-libraries/libnessus
> In directory raccoon.nessus.org:/tmp/cvs-serv15549
> 
> Modified Files:
>       Tag: NESSUS_2_2
> 	store.c 
> Log Message:
> fixes
> 
> Index: store.c
> ===================================================================
> RCS file: /usr/local/cvs/nessus-libraries/libnessus/store.c,v
> retrieving revision 1.28.2.5
> retrieving revision 1.28.2.6
> diff -u -d -r1.28.2.5 -r1.28.2.6
> --- store.c	28 Jun 2005 22:39:58 -0000	1.28.2.5
> +++ store.c	5 Jul 2005 15:14:49 -0000	1.28.2.6
> @@ -286,6 +286,7 @@
>   plug_set_category(ret, p.category);
>   plug_set_fname(ret, file);
>   plug_set_path(ret, p.path);
> + plug_set_family(ret, p.family, NULL);
>  
>    al = str2arglist(p.required_ports);
>   if ( al != NULL ) arg_add_value(ret, "required_ports", ARG_ARGLIST, -1, al);
> @@ -523,18 +524,10 @@
>   close(fd); 
>   
>   
> -#if 0
> - ret = emalloc(sizeof(struct arglist));
> - plug_set_id(ret, _plug_get_id(plugin));
> - plug_set_category(ret, _plug_get_category(plugin));
> - plug_set_fname(ret, file);
> - plug_set_path(ret, path);
> - plug_set_name(ret, name);
> - arg_add_value(ret, "preferences", ARG_ARGLIST, -1, arg_get_value(plugin, "preferences"));
> +
>   arg_set_value(plugin, "preferences", -1, NULL);
>   arg_free_all(plugin);
> -#endif
> - return plugin;
> + return NULL;
>  }
>  
>  
> 
> _______________________________________________
> Nessus-cvs mailing list
> [email protected]
> http://mail.nessus.org/mailman/listinfo/nessus-cvs

-- 
Jan-Oliver Wagner               http://intevation.de/~jan/
Intevation GmbH                      http://intevation.de/
Kolab Konsortium               http://kolab-konsortium.de/
FreeGIS                                http://freegis.org/

_______________________________________________
Nessus-devel mailing list
[email protected]
http://mail.nessus.org/mailman/listinfo/nessus-devel

256a257
> 
263d263
< 
271,274d270
<  /* 
<   * Look if the plugin is newer, and if that's the case also make sure that
<   * the plugin mtime is not in the future...
<   */
293d288
<  plug_set_family(ret, p.family, NULL);
308,315d302
<  al = str2arglist(p.dependencies);
<  if ( al != NULL ) arg_add_value(ret, "DEPENDENCIES", ARG_ARGLIST, -1, al);
< 
<  
<  if ( p.timeout != 0 ) arg_add_value(ret, "TIMEOUT", ARG_INT, -1, (void*)p.timeout);
< 
<  arg_add_value(ret, "NAME", ARG_STRING, strlen(p.name), estrdup(p.name));
< 
531c518,523
< 
---
>  ret = emalloc(sizeof(struct arglist));
>  plug_set_id(ret, _plug_get_id(plugin));
>  plug_set_category(ret, _plug_get_category(plugin));
>  plug_set_fname(ret, file);
>  plug_set_path(ret, path);
>  arg_add_value(ret, "preferences", ARG_ARGLIST, -1, arg_get_value(plugin, "preferences"));
534c526
<  return NULL;
---
>  return ret;