|
 |
de2b45 |
diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h
|
|
|
de2b45 |
--- openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 2020-01-27 11:33:02.941846935 +0100
|
|
|
de2b45 |
+++ openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h 2020-01-27 11:33:19.170846710 +0100
|
|
|
de2b45 |
@@ -103,7 +103,9 @@ __BEGIN_DECLS
|
|
|
de2b45 |
struct ldb_dn *samdb_search_dn(struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, const char *, ...) _PRINTF_ATTRIBUTE(4,5);
|
|
|
de2b45 |
struct dom_sid *dom_sid_add_rid(TALLOC_CTX *, const struct dom_sid *, uint32_t);
|
|
|
de2b45 |
bool encode_pw_buffer(uint8_t buffer[516], const char *, int);
|
|
|
de2b45 |
+#if 0 /* removed in samba 4.12 */
|
|
|
de2b45 |
void arcfour_crypt_blob(uint8_t *, int, const DATA_BLOB *);
|
|
|
de2b45 |
+#endif
|
|
|
de2b45 |
|
|
|
de2b45 |
/* The following public definitions come from libmapiadmin/mapiadmin.c */
|
|
|
de2b45 |
struct mapiadmin_ctx *mapiadmin_init(struct mapi_session *);
|
|
|
de2b45 |
diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c
|
|
|
de2b45 |
--- openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 2020-01-27 11:25:31.398853179 +0100
|
|
|
de2b45 |
+++ openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c 2020-01-27 11:31:27.490848255 +0100
|
|
|
de2b45 |
@@ -592,6 +592,9 @@ _PUBLIC_ enum MAPISTATUS mapiadmin_user_
|
|
|
de2b45 |
*/
|
|
|
de2b45 |
_PUBLIC_ enum MAPISTATUS mapiadmin_user_add(struct mapiadmin_ctx *mapiadmin_ctx)
|
|
|
de2b45 |
{
|
|
|
de2b45 |
+ OC_DEBUG(3, "mapiadmin_user_add(): is disabled");
|
|
|
de2b45 |
+ return MAPI_E_UNABLE_TO_COMPLETE;
|
|
|
de2b45 |
+#if 0 /* disable it, use samba function directly, if needed (no 'arcfour_crypt_blob' in samba 4.12) */
|
|
|
de2b45 |
TALLOC_CTX *mem_ctx;
|
|
|
de2b45 |
NTSTATUS status;
|
|
|
de2b45 |
enum MAPISTATUS retval;
|
|
|
de2b45 |
@@ -732,6 +735,7 @@ again:
|
|
|
de2b45 |
|
|
|
de2b45 |
talloc_free(mem_ctx);
|
|
|
de2b45 |
return MAPI_E_SUCCESS;
|
|
|
de2b45 |
+#endif
|
|
|
de2b45 |
}
|
|
|
de2b45 |
|
|
|
de2b45 |
/**
|