cleanups

git-svn: trunk@318

clamav-devel/AUTHORS

@@ -67,6 +67,7 @@ Luca 'NERvOus' Gibelli <nervous*clamav.net>
 Nigel Horne <njh*smsltd.demon.co.uk>
 Hrvoje Habjanic <hrvoje.habjanic*zg.hinet.hr>
 Robert Hogan <robert*roberthogan.net>
+James F.  Hranicky <jfh*cise.ufl.edu>
 Andy Igoshin <ai*vsu.ru>
 Nicholas M. Kirsch <nick*kirsch.org>
 Robbert Kouprie <robbert*exx.nl>
@@ -83,11 +84,13 @@ Arkadiusz Miskiewicz <misiek*pld.org.pl>
 Dustin Mollo <dustin.mollo*sonoma.edu>
 Hendrik Muhs <Hendrik.Muhs*student.uni-magdeburg.de>
 Masaki Ogawa <proc*mac.com>
+Phil Oleson <oz*nixil.net>
 Rudolph Pereira <r.pereira*isu.usyd.edu.au>
 Ed Phillips <ed*UDel.Edu>
 Andreas Piesk <Andreas.Piesk*heise.de>
 Ant La Porte <ant*dvere.net>
 Thomas Quinot <thomas*cuivre.fr.eu.org>
+Hector M. Rulot Segovia <Hector.Rulot@uv.es>
 David Santinoli <david*santinoli.com>
 Vijay Sarvepalli <vssarvep*office.uncg.edu>
 Matt Sullivan <matt*sullivan.gen.nz>

clamav-devel/ChangeLog

@@ -1,3 +1,9 @@
+Fri Feb 20 23:21:42 CET 2004 (tk)
+---------------------------------
+  * configure: --enable-yp-check (use ypmatch utility instead of /etc/passwd
+	       parsing) by James F.  Hranicky <jfh*cise.ufl.edu>.
+  * clamdscan, libclamav: small code cleanups from Phil Oleson <oz*nixil.net>
+
 Fri Feb 20 17:13:10 GMT 2004 (njh)
 ----------------------------------
   * clamav-milter:	If clamd is on the local machine and PidFile is defined

clamav-devel/clamdscan/client.c

@@ -121,12 +121,6 @@ int client(const struct optstruct *opt)
 
 
     /* we need the full path to the file */
-    if(!getcwd(cwd, 200)) {
-	mprintf("@Can't get absolute pathname of current working directory.\n");
-	return 2;
-    }
-
-
     if(!getcwd(cwd, 200)) {
 	mprintf("@Can't get the absolute pathname of the current working directory.\n");
 	return 2;

clamav-devel/configure.in

@@ -116,6 +116,10 @@ AC_ARG_ENABLE(id-check,
 [  --enable-id-check	  Use id utility instead of /etc/passwd parsing],
 use_id="yes", use_id="no")
 
+AC_ARG_ENABLE(yp-check,
+[  --enable-yp-check	  Use ypmatch utility instead of /etc/passwd parsing],
+use_yp="yes", use_yp="no")
+
 dnl clamav user
 AC_ARG_WITH(user, 
 [  --with-user=uid	  name of the clamav user (default=clamav).],
@@ -435,6 +439,12 @@ then
         clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
     fi
 
+    if test "$use_yp" = "yes"
+    then
+        clamavuser=`ypmatch ${clamav_user} passwd`
+        clamavgroup=`ypmatch ${clamav_group} group`
+    fi
+
     if test -z "$clamavuser" || test -z "$clamavgroup"
     then
         echo "ERROR: User \"$clamav_user\" (and/or group \"$clamav_group\") doesn't exist. Please create it. You can omit this check with the --disable-clamav option."

clamav-devel/libclamav/others.c

@@ -306,7 +306,9 @@ char *cl_gentemp(const char *dir)
 	cli_dbgmsg("cl_gentemp('%s'): out of memory\n", dir);
 	return NULL;
     }
-    cnt += sprintf(name, "%s/", mdir);
+    cnt += sprintf(name, "%s", mdir);
+    if(!strrchr(name, '/'))
+        strcat(name, '/');
 
     do {
 	for(i = 0; i < 32; i++)