[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1760-gfb3f7f4

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  fb3f7f4046fa195baf5116598772d9016238637f (commit)
       via  7ad8e22073b577cd454675bacf92549e81f55e1c (commit)
       via  e26ba6a3c6bf54b426b55c4ca0b9db98cd0d7b75 (commit)
      from  f34c0e7ada8ce625ee20e3d776e41dabbad71ce5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit fb3f7f4046fa195baf5116598772d9016238637f
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 1 14:23:56 2008 +0100

    NetBSD does not support AI_ADDRCONFIG

commit 7ad8e22073b577cd454675bacf92549e81f55e1c
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 1 13:04:10 2008 +0100

    NetBSD defines innetgr() in <netgroup.h>

commit e26ba6a3c6bf54b426b55c4ca0b9db98cd0d7b75
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 1 13:03:39 2008 +0100

    NetBSD needs PAM_SM_SESSION
    
    Otherwise no prototype for pam_sm_close_session is defined

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

Summary of changes:
 source/configure.in                 |    1 +
 source/include/includes.h           |    4 ++++
 source/lib/replace/system/network.h |    7 +++++++
 source/nsswitch/pam_winbind.h       |    1 +
 4 files changed, 13 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index a054590..4bfb1db 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -965,6 +965,7 @@ AC_CHECK_HEADERS(sys/sysmacros.h)
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
 AC_CHECK_HEADERS(langinfo.h locale.h)
 AC_CHECK_HEADERS(xfs/libxfs.h)
+AC_CHECK_HEADERS(netgroup.h)
 
 AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
 #if HAVE_RPC_RPC_H
diff --git a/source/include/includes.h b/source/include/includes.h
index b7fcc10..041c431 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -250,6 +250,10 @@ typedef int ber_int_t;
 #include <langinfo.h>
 #endif
 
+#if HAVE_NETGROUP_H
+#include <netgroup.h>
+#endif
+
 #if defined(HAVE_AIO_H) && defined(WITH_AIO)
 #include <aio.h>
 #endif
diff --git a/source/lib/replace/system/network.h b/source/lib/replace/system/network.h
index fe6e468..aff8a84 100644
--- a/source/lib/replace/system/network.h
+++ b/source/lib/replace/system/network.h
@@ -137,8 +137,15 @@ const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #endif
 
 #ifndef AI_ADDRCONFIG
+/*
+ * logic copied from AI_NUMERICHOST
+ */
+#if defined(HAVE_STRUCT_ADDRINFO) && defined(HAVE_GETADDRINFO)
+#define AI_ADDRCONFIG	0
+#else
 #define AI_ADDRCONFIG	0x0020
 #endif
+#endif
 
 #ifndef AI_NUMERICSERV
 /*
diff --git a/source/nsswitch/pam_winbind.h b/source/nsswitch/pam_winbind.h
index 6ec564f..a1d3272 100644
--- a/source/nsswitch/pam_winbind.h
+++ b/source/nsswitch/pam_winbind.h
@@ -12,6 +12,7 @@
 #define PAM_SM_AUTH
 #define PAM_SM_ACCOUNT
 #define PAM_SM_PASSWORD
+#define PAM_SM_SESSION
 
 #ifndef PAM_WINBIND_CONFIG_FILE
 #define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf"


-- 
Samba Shared Repository