[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-2118-gbccef82
Stefan Metzmacher
metze at samba.org
Mon Jun 8 07:44:43 GMT 2009
The branch, master has been updated
via bccef8251654f52751ad65e9906323a73c47fdb4 (commit)
via eff9bcc9c74089d5f1e944449aa4ebb8a0c49d81 (commit)
via faabc97c9adffd9468a5d1606467359a81445cf3 (commit)
from 9726e760288df8ec80a07063bab9f7e96d2e80da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bccef8251654f52751ad65e9906323a73c47fdb4
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 8 09:01:45 2009 +0200
replace: add fallback define for IOV_MAX
This hopefully fixes the build on IRIX.
metze
commit eff9bcc9c74089d5f1e944449aa4ebb8a0c49d81
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 8 08:20:11 2009 +0200
talloc: try to fix the source4 build on AIX
metze
commit faabc97c9adffd9468a5d1606467359a81445cf3
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 8 08:15:57 2009 +0200
async_sock: try fix the source4 build on FreeBSD, Solaris, SLES8
metze
-----------------------------------------------------------------------
Summary of changes:
lib/async_req/async_sock.c | 12 ++++++++----
lib/async_req/async_sock.h | 3 ++-
lib/async_req/config.mk | 2 +-
lib/replace/system/network.h | 16 ++++++++++++++++
lib/talloc/talloc.h | 2 +-
nsswitch/libwbclient/wb_reqtrans.c | 8 ++------
nsswitch/libwbclient/wbc_async.c | 6 ++----
7 files changed, 32 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 643eb2d..cf007e1 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -21,12 +21,16 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "includes.h"
-#include "lib/talloc/talloc.h"
-#include "lib/tevent/tevent.h"
+#include "replace.h"
+#include "system/network.h"
+#include "system/filesys.h"
+#include <talloc.h>
+#include <tevent.h>
#include "lib/async_req/async_sock.h"
+
+/* Note: lib/util/ is currently GPL */
#include "lib/util/tevent_unix.h"
-#include <fcntl.h>
+#include "lib/util/util.h"
#ifndef TALLOC_FREE
#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
diff --git a/lib/async_req/async_sock.h b/lib/async_req/async_sock.h
index d47be30..e7ddff8 100644
--- a/lib/async_req/async_sock.h
+++ b/lib/async_req/async_sock.h
@@ -24,7 +24,8 @@
#ifndef __ASYNC_SOCK_H__
#define __ASYNC_SOCK_H__
-#include "includes.h"
+#include <talloc.h>
+#include <tevent.h>
struct tevent_req *async_send_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/lib/async_req/config.mk b/lib/async_req/config.mk
index 1f4b557..64e537c 100644
--- a/lib/async_req/config.mk
+++ b/lib/async_req/config.mk
@@ -1,4 +1,4 @@
[SUBSYSTEM::LIBASYNC_REQ]
-PUBLIC_DEPENDENCIES = LIBREPLACE_NETWORK
+PUBLIC_DEPENDENCIES = LIBREPLACE_NETWORK LIBTALLOC LIBTEVENT
LIBASYNC_REQ_OBJ_FILES = $(addprefix ../lib/async_req/, async_sock.o)
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index 6add99c..c836410 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -307,6 +307,22 @@ typedef unsigned short int sa_family_t;
#endif
#endif
+#ifndef IOV_MAX
+# ifdef UIO_MAXIOV
+# define IOV_MAX UIO_MAXIOV
+# else
+# ifdef __sgi
+ /*
+ * IRIX 6.5 has sysconf(_SC_IOV_MAX)
+ * which might return 512 or bigger
+ */
+# define IOV_MAX 512
+# else
+# error IOV_MAX and UIO_MAXIOV undefined
+# endif
+# endif
+#endif
+
#ifndef HAVE_STRUCT_ADDRINFO
#define HAVE_STRUCT_ADDRINFO
struct addrinfo {
diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index f87564a..a4b33c3 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -121,7 +121,7 @@ typedef void TALLOC_CTX;
/* The following definitions come from talloc.c */
void *_talloc(const void *context, size_t size);
void *talloc_pool(const void *context, size_t size);
-void _talloc_set_destructor(const void *ptr, int (*destructor)(void *));
+void _talloc_set_destructor(const void *ptr, int (*_destructor)(void *));
int talloc_increase_ref_count(const void *ptr);
size_t talloc_reference_count(const void *ptr);
void *_talloc_reference(const void *context, const void *ptr);
diff --git a/nsswitch/libwbclient/wb_reqtrans.c b/nsswitch/libwbclient/wb_reqtrans.c
index 84ed719..5328423 100644
--- a/nsswitch/libwbclient/wb_reqtrans.c
+++ b/nsswitch/libwbclient/wb_reqtrans.c
@@ -28,18 +28,14 @@
#include "system/network.h"
#include <talloc.h>
#include <tevent.h>
-struct fd_event;
-struct event_context;
#include "lib/async_req/async_sock.h"
#include "lib/util/tevent_unix.h"
#include "nsswitch/winbind_struct_protocol.h"
#include "nsswitch/libwbclient/wbclient.h"
#include "nsswitch/libwbclient/wbc_async.h"
-#ifdef DBGC_CLASS
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_WINBIND
-#endif
+/* can't use DEBUG here... */
+#define DEBUG(a,b)
struct req_read_state {
struct winbindd_request *wb_req;
diff --git a/nsswitch/libwbclient/wbc_async.c b/nsswitch/libwbclient/wbc_async.c
index 5f985f9..fb8d8b1 100644
--- a/nsswitch/libwbclient/wbc_async.c
+++ b/nsswitch/libwbclient/wbc_async.c
@@ -26,8 +26,6 @@
#include "system/network.h"
#include <talloc.h>
#include <tevent.h>
-struct fd_event;
-struct event_context;
#include "lib/async_req/async_sock.h"
#include "nsswitch/winbind_struct_protocol.h"
#include "nsswitch/libwbclient/wbclient.h"
@@ -254,7 +252,7 @@ static struct tevent_req *wb_connect_send(TALLOC_CTX *mem_ctx,
/* Connect to socket */
- path = talloc_asprintf(talloc_tos(), "%s/%s", dir,
+ path = talloc_asprintf(mem_ctx, "%s/%s", dir,
WINBINDD_SOCKET_NAME);
if (path == NULL) {
goto nomem;
@@ -613,7 +611,7 @@ static bool wb_trans_retry(struct tevent_req *req,
}
subreq = tevent_wakeup_send(state, state->ev,
- timeval_current_ofs(1, 0));
+ tevent_timeval_current_ofs(1, 0));
if (tevent_req_nomem(subreq, req)) {
return true;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list