[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  cfee179... s3: Attempt to fix the build on NetBSD
      from  9e02764... pydsdb: Mark all SamDB and Schema methods that are in pydsdb as private, to discourage them being called directly.

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


- Log -----------------------------------------------------------------
commit cfee179d03e9c3b8d02a51995bd1c205daabb6c3
Author: Kai Blin <kai at samba.org>
Date:   Sun Jun 20 16:29:24 2010 +0200

    s3: Attempt to fix the build on NetBSD
    
    Unlike Linux and OSX, NetBSD seems to have *netgrent prototypes in netgroup.h.

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

Summary of changes:
 source3/configure.in |    9 ++++++---
 source3/wscript      |    6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 04ddc03..424c320 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6423,19 +6423,22 @@ AC_SUBST(FLAGS1)
 CFLAGS_SAVE=$CFLAGS
 CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 AC_CACHE_CHECK([for setnetgrent prototype],samba_cv_setnetgrent_prototype, [
-    AC_TRY_COMPILE([#include<netdb.h>],[setnetgrent("foo")],
+    AC_TRY_COMPILE([#include<netdb.h>
+                    #include<netgroup.h>],[setnetgrent("foo")],
                     samba_cv_setnetgrent_prototype=yes, samba_cv_setnetgrent_prototype=no)])
 if test x"$samba_cv_setnetgrent_prototype" = x"yes"; then
     AC_DEFINE(HAVE_SETNETGRENT_PROTOTYPE, 1, [If setnetgrent prototype is defined])
 fi
 AC_CACHE_CHECK([for getnetgrent prototype],samba_cv_getnetgrent_prototype, [
-    AC_TRY_COMPILE([#include<netdb.h>],[char *dom, *user,*host; getnetgrent(&dom,&user,&host)],
+    AC_TRY_COMPILE([#include<netdb.h>
+                    #include<netgroup.h>],[char *dom, *user,*host; getnetgrent(&dom,&user,&host)],
                     samba_cv_getnetgrent_prototype=yes, samba_cv_getnetgrent_prototype=no)])
 if test x"$samba_cv_getnetgrent_prototype" = x"yes"; then
     AC_DEFINE(HAVE_GETNETGRENT_PROTOTYPE, 1, [If getnetgrent prototype is defined])
 fi
 AC_CACHE_CHECK([for endnetgrent prototype],samba_cv_endnetgrent_prototype, [
-    AC_TRY_COMPILE([#include<netdb.h>],[endnetgrent()],
+    AC_TRY_COMPILE([#include<netdb.h>
+                    #include<netgroup.h>],[endnetgrent()],
                     samba_cv_endnetgrent_prototype=yes, samba_cv_endnetgrent_prototype=no)])
 if test x"$samba_cv_endnetgrent_prototype" = x"yes"; then
     AC_DEFINE(HAVE_ENDNETGRENT_PROTOTYPE, 1, [If endnetgrent prototype is defined])
diff --git a/source3/wscript b/source3/wscript
index aec71af..0b31563 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -364,15 +364,15 @@ utimensat vsyslog _write __write __xstat
     conf.CHECK_FUNCS('setnetgrent getnetgrent endnetgrent')
     conf.CHECK_CODE('setnetgrent("foo")', 'HAVE_SETNETGRENT_PROTOTYPE',
                     msg="Checking for setnetgrent prototype",
-                    headers='netdb.h',
+                    headers='netdb.h netgroup.h',
                     cflags="-Werror-implicit-function-declaration")
     conf.CHECK_CODE('getnetgrent', 'HAVE_GETNETGRENT_PROTOTYPE',
                     msg="Checking for getnetgrent prototype",
-                    headers='netdb.h',
+                    headers='netdb.h netgroup.h',
                     cflags="-Werror-implicit-function-declaration")
     conf.CHECK_CODE('endnetgrent', 'HAVE_ENDNETGRENT_PROTOTYPE',
                     msg="Checking for endnetgrent prototype",
-                    headers='netdb.h',
+                    headers='netdb.h netgroup.h',
                     cflags="-Werror-implicit-function-declaration")
 
     #FIXME: Should just be set when krb5 and ldap requirements are fulfilled


-- 
Samba Shared Repository