Hi,
Andrew Bartlett is looking to release another alpha of samba4, and asked me to
look at whether trunk
of samba is good with openchange.
I found a couple of things that I think need to be fixed in samba, and have
posted patches to the
samba mailing list for those.
This the set of changes to openchange that I'm expecting to make for the next
alpha.
Index: script/samba4_ver.sh
===================================================================
--- script/samba4_ver.sh (revision 1548)
+++ script/samba4_ver.sh (working copy)
@@ -1,4 +1,4 @@
-SAMBA4_GIT_REV=4ceae35
-SAMBA4_GIT_VER=4.0.0alpha8
-SAMBA4_RELEASE=4.0.0alpha8
+SAMBA4_GIT_REV=a770cae
+SAMBA4_GIT_VER=4.0.0alpha9
+SAMBA4_RELEASE=4.0.0alpha9
BH: That part should be fairly obvious. The exact GIT_REV will be later than
the one here, of course.
Index: libmapiadmin/mapiadmin_user.c
===================================================================
--- libmapiadmin/mapiadmin_user.c (revision 1548)
+++ libmapiadmin/mapiadmin_user.c (working copy)
@@ -226,7 +226,7 @@
remote_ldb_url = talloc_asprintf(mem_ctx, "ldap://%s";, profile->server);
MAPI_RETVAL_IF(!remote_ldb_url, MAPI_E_CORRUPT_DATA, mem_ctx);
remote_ldb = ldb_wrap_connect(mem_ctx, ev, global_mapi_ctx->lp_ctx,
remote_ldb_url,
- NULL,
mapiadmin_ctx->session->profile->credentials, 0, NULL);
+ NULL,
mapiadmin_ctx->session->profile->credentials, 0);
MAPI_RETVAL_IF(!remote_ldb, MAPI_E_NETWORK_ERROR, mem_ctx);
/* Search the user_dn */
Index: torture/exchange_createuser.c
===================================================================
--- torture/exchange_createuser.c (revision 1548)
+++ torture/exchange_createuser.c (working copy)
@@ -105,7 +105,7 @@
/* open LDAP connection */
remote_ldb_url = talloc_asprintf(mem_ctx, "ldap://%s";, profile->server);
remote_ldb = ldb_wrap_connect(mem_ctx, ev, global_mapi_ctx->lp_ctx,
remote_ldb_url,
- NULL,
cmdline_credentials, 0, NULL);
+ NULL,
cmdline_credentials, 0);
if (!remote_ldb) return NT_STATUS_UNSUCCESSFUL;
/* search the user's record using the user dom_sid */
BH: Those two changes are to reflect API changes within Samba, to match this
change:
http://gitweb.samba.org/?p=samba.git;a=commitdiff;h=4ad0397d8afdd6bec609506f3736f8567afe7564
Index: mapiproxy/dcesrv_mapiproxy.c
===================================================================
--- mapiproxy/dcesrv_mapiproxy.c (revision 1548)
+++ mapiproxy/dcesrv_mapiproxy.c (working copy)
@@ -149,7 +149,7 @@
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- dce_call->context->assoc_group_id =
private->c_pipe->assoc_group_id;
+ // dce_call->context->assoc_group_id =
private->c_pipe->assoc_group_id;
} else {
status = dcerpc_pipe_connect(dce_call->context,
@@ -164,7 +164,7 @@
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- dce_call->context->assoc_group_id =
private->c_pipe->assoc_group_id;
+ // dce_call->context->assoc_group_id =
private->c_pipe->assoc_group_id;
}
private->connected = true;
BH: I clearly have no idea about this. It looks like context no longer has
assoc_group_id, but
I can't find the change or the fix.
Brad
_______________________________________________
devel mailing list
[email protected]
http://mailman.openchange.org/listinfo/devel
