Attachment 5814 Details for Bug 7534 – proposed patch.

[patch] proposed patch.

endnetgrent.patch (text/plain), 3.36 KB, created by Ira Cooper on 2010-06-28 15:34:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ira Cooper

Created: 2010-06-28 15:34:37 UTC

Size: 3.36 KB

patch

obsolete

>commit 4e35da61926ad2af6617acb735458b97a08abb79
>Author: Ira Cooper <samba@ira.wakeful.net>
>Date:   Mon Jun 28 16:18:01 2010 -0400
>
>    s3: Fix setnetgrent, getnetgrent, endnetgrent prototype detection.
>    
>    netgroup.h does not exist on Solaris so configure was not able to finxd
>    the prototypes for setnetgrent, getnetgrent, endnetgrent.
>    
>    netdb.h is used on Solaris, OSX, and Linux.
>
>diff --git a/source3/configure.in b/source3/configure.in
>index 424c320..2aa9625 100644
>--- a/source3/configure.in
>+++ b/source3/configure.in
>@@ -6423,22 +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>
>-                    #include<netgroup.h>],[setnetgrent("foo")],
>+    AC_TRY_COMPILE([#include<netdb.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>
>-                    #include<netgroup.h>],[char *dom, *user,*host; getnetgrent(&dom,&user,&host)],
>+    AC_TRY_COMPILE([#include<netdb.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>
>-                    #include<netgroup.h>],[endnetgrent()],
>+    AC_TRY_COMPILE([#include<netdb.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 0b31563..aec71af 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 netgroup.h',
>+                    headers='netdb.h',
>                     cflags="-Werror-implicit-function-declaration")
>     conf.CHECK_CODE('getnetgrent', 'HAVE_GETNETGRENT_PROTOTYPE',
>                     msg="Checking for getnetgrent prototype",
>-                    headers='netdb.h netgroup.h',
>+                    headers='netdb.h',
>                     cflags="-Werror-implicit-function-declaration")
>     conf.CHECK_CODE('endnetgrent', 'HAVE_ENDNETGRENT_PROTOTYPE',
>                     msg="Checking for endnetgrent prototype",
>-                    headers='netdb.h netgroup.h',
>+                    headers='netdb.h',
>                     cflags="-Werror-implicit-function-declaration")
> 
>     #FIXME: Should just be set when krb5 and ldap requirements are fulfilled

Actions: View

Attachments on bug 7534: 5814 | 5819