[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  e7dcb912 libreplace: Fix build on MacOS where we have the same fn name but more arguments
       via  901e235 libreplace: Solaris needs system/dir.h for that xattr wrapper implementation
       via  7ac47b0 build: Remove check for res_ninit (Revert "s3: Check for res_ninit")
      from  ede90a5 build: Show extra configure results found by WAF as well

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e7dcb9125cb600770b330dcaa31296703c46cc7b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 2 21:25:09 2012 +1000

    libreplace: Fix build on MacOS where we have the same fn name but more arguments
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Sat Jun  2 15:52:51 CEST 2012 on sn-devel-104

commit 901e2353858676cfc33f0e324a1e632099a38473
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 2 21:05:34 2012 +1000

    libreplace: Solaris needs system/dir.h for that xattr wrapper implementation

commit 7ac47b074b83bf59cb9362d8ce4bcca16e49a96d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 2 14:09:09 2012 +1000

    build: Remove check for res_ninit (Revert "s3: Check for res_ninit")
    
    This reverts commit 4f6b1e8c81776cf1fa386574e60e54fe6b4fe82e because I
    cannot find any use of this configure check, and it is one of the
    differences between the WAF and autoconf builds.
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/replace.h |   16 ++++++++--------
 lib/replace/xattr.c   |    1 +
 source3/configure.in  |    8 --------
 3 files changed, 9 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 218303f..1166813 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -544,42 +544,42 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset)
 #endif
 
 #if !defined(HAVE_GETXATTR) || defined(XATTR_ADDITIONAL_OPTIONS)
-#define getxattr rep_getxattr
+#define getxattr(path, name, value, size) rep_getxattr(path, name, value, size)
 /* prototype is in "system/filesys.h" */
 #endif
 
 #if !defined(HAVE_FGETXATTR) || defined(XATTR_ADDITIONAL_OPTIONS)
-#define fgetxattr rep_fgetxattr
+#define fgetxattr(filedes, name, value, size) rep_fgetxattr(filedes, name, value, size)
 /* prototype is in "system/filesys.h" */
 #endif
 
 #if !defined(HAVE_LISTXATTR) || defined(XATTR_ADDITIONAL_OPTIONS)
-#define listxattr rep_listxattr
+#define listxattr(path, list, size) rep_listxattr(path, list, size)
 /* prototype is in "system/filesys.h" */
 #endif
 
 #if !defined(HAVE_FLISTXATTR) || defined(XATTR_ADDITIONAL_OPTIONS)
-#define flistxattr rep_flistxattr
+#define flistxattr(filedes, value, size) rep_flistxattr(filedes, value, size)
 /* prototype is in "system/filesys.h" */
 #endif
 
 #if !defined(HAVE_REMOVEXATTR) || defined(XATTR_ADDITIONAL_OPTIONS)
-#define removexattr rep_removexattr
+#define removexattr(path, name) rep_removexattr(path, name)
 /* prototype is in "system/filesys.h" */
 #endif
 
 #if !defined(HAVE_FREMOVEXATTR) || defined(XATTR_ADDITIONAL_OPTIONS)
-#define fremovexattr rep_fremovexattr
+#define fremovexattr(filedes, name) rep_fremovexattr(filedes, name)
 /* prototype is in "system/filesys.h" */
 #endif
 
 #if !defined(HAVE_SETXATTR) || defined(XATTR_ADDITIONAL_OPTIONS)
-#define setxattr rep_setxattr
+#define setxattr(path, name, value, size, flags) rep_setxattr(path, name, value, size, flags)
 /* prototype is in "system/filesys.h" */
 #endif
 
 #if !defined(HAVE_FSETXATTR) || defined(XATTR_ADDITIONAL_OPTIONS)
-#define fsetxattr rep_fsetxattr
+#define fsetxattr(filedes, name, value, size, flags) rep_fsetxattr(filedes, name, value, size, flags)
 /* prototype is in "system/filesys.h" */
 #endif
 
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index 95bea77..c08ac3a 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -25,6 +25,7 @@
 
 #include "replace.h"
 #include "system/filesys.h"
+#include "system/dir.h"
 
 /******** Solaris EA helper function prototypes ********/
 #ifdef HAVE_ATTROPEN
diff --git a/source3/configure.in b/source3/configure.in
index af0f7c8..37f37f6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1222,14 +1222,6 @@ AC_CHECK_LIB(resolv, dn_expand)
 AC_CHECK_LIB(resolv, _dn_expand)
 AC_CHECK_LIB(resolv, __dn_expand)
 
-AC_TRY_COMPILE([#include <resolv.h>],
-	       [struct __res_state s; res_ninit(&s);],
-	       ac_cv_have_res_ninit=yes,ac_cv_have_res_ninit=no)
-
-if test x"$ac_cv_have_res_ninit" = x"yes"; then
-	AC_DEFINE(HAVE_RES_NINIT, 1, [Whether we have res_ninit])
-fi
-
 #
 # Check for the functions putprpwnam, set_auth_parameters,
 # getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity


-- 
Samba Shared Repository