From 9f71410ad3277cf55bc90c7432393cdbd18492dd Mon Sep 17 00:00:00 2001
From: Tomasz Kojm <tkojm@clamav.net>
Date: Tue, 22 Jan 2008 14:52:08 +0000
Subject: [PATCH] if available use dscl on Mac OS X (bb#753)

git-svn: trunk@3524
---
 ChangeLog    |  4 ++++
 configure    | 13 ++++++++++---
 configure.in | 12 +++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ade49df4..fbb81aff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 22 15:29:15 CET 2008 (tk)
+---------------------------------
+  * configure: if available use dscl on Mac OS X (bb#753)
+
 Tue Jan 22 11:54:52 CET 2008 (tk)
 ---------------------------------
   * libclamunrar/unrar.c: disable 'Unknown RAR pack method' error message due
diff --git a/configure b/configure
index 55c651415..eaedb730f 100755
--- a/configure
+++ b/configure
@@ -15737,10 +15737,17 @@ fi
 
     if test "$use_netinfo" = "yes"
     then
-	{ echo "$as_me:$LINENO: checking for $clamav_user using netinfo" >&5
+	if test -x /usr/bin/dscl; then
+	    { echo "$as_me:$LINENO: checking for $clamav_user using dscl" >&5
+echo $ECHO_N "checking for $clamav_user using dscl... $ECHO_C" >&6; }
+	    clamavuser=`/usr/bin/dscl . -list /Users |grep ${clamav_user}`
+	    clamavgroup=`/usr/bin/dscl . -list /Groups |grep ${clamav_group}`
+	else
+	    { echo "$as_me:$LINENO: checking for $clamav_user using netinfo" >&5
 echo $ECHO_N "checking for $clamav_user using netinfo... $ECHO_C" >&6; }
-        clamavuser=`/usr/bin/nidump passwd . |grep ${clamav_user}`
-        clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
+	    clamavuser=`/usr/bin/nidump passwd . |grep ${clamav_user}`
+	    clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
+	fi
     fi
 
     if test "$use_yp" = "yes"
diff --git a/configure.in b/configure.in
index 3944dea8e..98d4b7ae3 100644
--- a/configure.in
+++ b/configure.in
@@ -1162,9 +1162,15 @@ then
 
     if test "$use_netinfo" = "yes"
     then
-	AC_MSG_CHECKING(for $clamav_user using netinfo)
-        clamavuser=`/usr/bin/nidump passwd . |grep ${clamav_user}`
-        clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
+	if test -x /usr/bin/dscl; then
+	    AC_MSG_CHECKING(for $clamav_user using dscl)
+	    clamavuser=`/usr/bin/dscl . -list /Users |grep ${clamav_user}`
+	    clamavgroup=`/usr/bin/dscl . -list /Groups |grep ${clamav_group}`
+	else
+	    AC_MSG_CHECKING(for $clamav_user using netinfo)
+	    clamavuser=`/usr/bin/nidump passwd . |grep ${clamav_user}`
+	    clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
+	fi
     fi
 
     if test "$use_yp" = "yes"