[Openvas-commits] r3201 - in trunk/openvas-server: . openvasd

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2009-04-27 14:13:02 +0200 (Mon, 27 Apr 2009)
New Revision: 3201

Modified:
   trunk/openvas-server/ChangeLog
   trunk/openvas-server/openvasd/plugs_hash.c
Log:
* openvasd/plugs_hash.c (plugins_hash): Remove handling of obsolete
"plugins" directory in the user_home directory.


Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog	2009-04-27 12:03:55 UTC (rev 3200)
+++ trunk/openvas-server/ChangeLog	2009-04-27 12:13:02 UTC (rev 3201)
@@ -1,3 +1,8 @@
+2009-04-27  Michael Wiegand <michael.wiegand at intevation.de>
+
+	* openvasd/plugs_hash.c (plugins_hash): Remove handling of obsolete
+	"plugins" directory in the user_home directory.
+
 2009-04-20  Michael Wiegand <michael.wiegand at intevation.de>
 
 	* openvas-adduser.in: Stop openvas-adduser from creating the now

Modified: trunk/openvas-server/openvasd/plugs_hash.c
===================================================================
--- trunk/openvas-server/openvasd/plugs_hash.c	2009-04-27 12:03:55 UTC (rev 3200)
+++ trunk/openvas-server/openvasd/plugs_hash.c	2009-04-27 12:13:02 UTC (rev 3201)
@@ -133,10 +133,9 @@
 
 
 /*
- * returns the hash of the hashes of the plugins in the plugins dir +
- * plugins in the user home dir.  Returns NULL in case of severe errors
- * (for instance if libgrypt cannot initialize the md5 message digest
- * object).
+ * returns the hash of the hashes of the plugins in the plugins dir. Returns
+ * NULL in case of severe errors (for instance if libgrypt cannot initialize
+ * the md5 message digest object).
  */
 char * 
 plugins_hash(globals)
@@ -160,12 +159,6 @@
 
  /* FIXME: check for error return from gcry_md_open */
  dir_plugins_hash(ctx, dir);
- uhome = user_home(globals);
- dir = emalloc(strlen(uhome) + strlen("/plugins") + 1);
- sprintf(dir, "%s/plugins", uhome);
- efree(&uhome);
- dir_plugins_hash(ctx, dir);
- efree(&dir);
  digest = gcry_md_read(ctx, GCRY_MD_MD5);
  ret = md5sum_hex(digest);
  gcry_md_close(ctx);