svn commit: samba r17664 - in branches/SOC/mkhl/ejs-map: .
mkhl at samba.org
mkhl at samba.org
Mon Aug 21 14:35:06 GMT 2006
Author: mkhl
Date: 2006-08-21 14:35:04 +0000 (Mon, 21 Aug 2006)
New Revision: 17664
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17664
Log:
Remove files that were obsoleted by ejs.patch.
Martin
Removed:
branches/SOC/mkhl/ejs-map/entryUUID_support.c
branches/SOC/mkhl/ejs-map/ldb_map.c-privdat.patch
branches/SOC/mkhl/ejs-map/ldb_map.h-privdat.patch
branches/SOC/mkhl/ejs-map/samba3sam.c-privdat.patch
Changeset:
Deleted: branches/SOC/mkhl/ejs-map/entryUUID_support.c
===================================================================
--- branches/SOC/mkhl/ejs-map/entryUUID_support.c 2006-08-21 14:32:59 UTC (rev 17663)
+++ branches/SOC/mkhl/ejs-map/entryUUID_support.c 2006-08-21 14:35:04 UTC (rev 17664)
@@ -1,72 +0,0 @@
-static int ejs_encodeGuid(MprHandle eid, int argc, struct MprVar **argv)
-{
- struct GUID *guid;
- struct ldb_val val;
- NTSTATUS status;
-
- if (argc != 1) {
- ejsSetErrorMsg(eid, "encodeGuid invalid argument count");
- return -1;
- }
-
- val = data_blob(NULL, 0);
-
- guid = mprToGuid(mprMemCtx(), argv[0]);
- if (guid == NULL) {
- ejsSetErrorMsg(eid, "encodeGuid invalid GUID string");
- return -1;
- }
-
- status = ndr_push_struct_blob(&val, mprMemCtx(), guid,
- (ndr_push_flags_fn_t)ndr_push_GUID);
- if (NT_STATUS_IS_OK(status)) {
- talloc_free(guid);
- ejsSetErrorMsg(eid, "encodeGuid failed to encode GUID");
- return -1;
- }
-
- talloc_free(guid);
- mpr_Return(mprData(val.data, val.length));
- return 0;
-}
-
-static int ejs_decodeGuid(MprHandle eid, int argc, struct MprVar **argv)
-{
- struct GUID *guid;
- struct ldb_val val;
- NTSTATUS status;
-
- if (argc != 1) {
- ejsSetErrorMsg(eid, "decodeGuid invalid argument count");
- return -1;
- }
-
- guid = talloc(mprMemCtx(), struct GUID);
- if (guid == NULL) {
- ejsSetErrorMsg(eid, "decodeGuid Out of Memory");
- return -1;
- }
-
- val.data = (uint8_t *)mprToString(argv[0]);
- val.length = strlen((char *)val.data);
-
- status = ndr_pull_struct_blob(in, guid, guid,
- (ndr_pull_flags_fn_t)ndr_pull_GUID);
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(guid);
- ejsSetErrorMsg(eid, "decodeGuid failed to decode GUID");
- return -1;
- }
-
- mpr_Return(mprGuid(guid));
- talloc_free(guid);
- return 0;
-}
-
-NTSTATUS smb_setup_ejs_guid(void)
-{
- ejsDefineCFunction(-1, "encodeGuid", ejs_encodeGuid, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineCFunction(-1, "decodeGuid", ejs_decodeGuid, NULL, MPR_VAR_SCRIPT_HANDLE);
- return NT_STATUS_OK;
-}
-
Deleted: branches/SOC/mkhl/ejs-map/ldb_map.c-privdat.patch
===================================================================
--- branches/SOC/mkhl/ejs-map/ldb_map.c-privdat.patch 2006-08-21 14:32:59 UTC (rev 17663)
+++ branches/SOC/mkhl/ejs-map/ldb_map.c-privdat.patch 2006-08-21 14:35:04 UTC (rev 17664)
@@ -1,85 +0,0 @@
-Index: lib/ldb/modules/ldb_map.c
-===================================================================
---- lib/ldb/modules/ldb_map.c (revision 17506)
-+++ lib/ldb/modules/ldb_map.c (working copy)
-@@ -637,7 +637,7 @@
- static struct ldb_val ldb_val_map_local(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, struct ldb_val val)
- {
- if (map && (map->type == MAP_CONVERT) && (map->u.convert.convert_local)) {
-- return map->u.convert.convert_local(module, mem_ctx, &val);
-+ return map->u.convert.convert_local(module, mem_ctx, map, &val);
- }
-
- return ldb_val_dup(mem_ctx, &val);
-@@ -647,7 +647,7 @@
- static struct ldb_val ldb_val_map_remote(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, struct ldb_val val)
- {
- if (map && (map->type == MAP_CONVERT) && (map->u.convert.convert_remote)) {
-- return map->u.convert.convert_remote(module, mem_ctx, &val);
-+ return map->u.convert.convert_remote(module, mem_ctx, map, &val);
- }
-
- return ldb_val_dup(mem_ctx, &val);
-@@ -968,7 +968,7 @@
- return 0;
- }
-
-- el = map->u.generate.generate_local(module, local, old->name, remote);
-+ el = map->u.generate.generate_local(module, local, map, old->name, remote);
- break;
- }
-
-@@ -1028,7 +1028,7 @@
- * maybe postpone generation until they have been mapped?
- */
-
-- map->u.generate.generate_remote(module, map->local_name, msg, remote, local);
-+ map->u.generate.generate_remote(module, map, map->local_name, msg, remote, local);
- return 0;
- }
-
-@@ -1481,7 +1481,7 @@
-
- map = map_attr_find_local(data, tree->u.equality.attr);
- if (map->convert_operator) {
-- *new = map->convert_operator(data, mem_ctx, tree);
-+ *new = map->convert_operator(module, mem_ctx, map, tree);
- return 0;
- }
-
-@@ -1638,7 +1638,7 @@
- * ================================================ */
-
- /* Map a DN contained in an ldb value into the remote partition. */
--static struct ldb_val ldb_dn_convert_local(struct ldb_module *module, void *mem_ctx, const struct ldb_val *val)
-+static struct ldb_val ldb_dn_convert_local(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const struct ldb_val *val)
- {
- struct ldb_dn *dn, *newdn;
- struct ldb_val newval;
-@@ -1658,7 +1658,7 @@
- }
-
- /* Map a DN contained in an ldb value into the local partition. */
--static struct ldb_val ldb_dn_convert_remote(struct ldb_module *module, void *mem_ctx, const struct ldb_val *val)
-+static struct ldb_val ldb_dn_convert_remote(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const struct ldb_val *val)
- {
- struct ldb_dn *dn, *newdn;
- struct ldb_val newval;
-@@ -1695,7 +1695,7 @@
- }
-
- /* Generate a remote message with a mapped objectClass. */
--static void map_objectclass_generate_remote(struct ldb_module *module, const char *local_attr, const struct ldb_message *old, struct ldb_message *remote, struct ldb_message *local)
-+static void map_objectclass_generate_remote(struct ldb_module *module, const struct ldb_map_attribute *map, const char *local_attr, const struct ldb_message *old, struct ldb_message *remote, struct ldb_message *local)
- {
- struct ldb_message_element *el, *oc;
- struct ldb_val val;
-@@ -1767,7 +1767,7 @@
- }
-
- /* Generate a local message with a mapped objectClass. */
--static struct ldb_message_element *map_objectclass_generate_local(struct ldb_module *module, void *mem_ctx, const char *remote_attr, const struct ldb_message *remote)
-+static struct ldb_message_element *map_objectclass_generate_local(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const char *remote_attr, const struct ldb_message *remote)
- {
- struct ldb_message_element *el, *oc;
- struct ldb_val val;
Deleted: branches/SOC/mkhl/ejs-map/ldb_map.h-privdat.patch
===================================================================
--- branches/SOC/mkhl/ejs-map/ldb_map.h-privdat.patch 2006-08-21 14:32:59 UTC (rev 17663)
+++ branches/SOC/mkhl/ejs-map/ldb_map.h-privdat.patch 2006-08-21 14:35:04 UTC (rev 17664)
@@ -1,53 +0,0 @@
-Index: lib/ldb/modules/ldb_map.h
-===================================================================
---- lib/ldb/modules/ldb_map.h (revision 17506)
-+++ lib/ldb/modules/ldb_map.h (working copy)
-@@ -48,9 +48,18 @@
-
- struct ldb_map_context;
-
--/* convert a local ldb_val to a remote ldb_val */
--typedef struct ldb_val (*ldb_map_convert_func) (struct ldb_module *module, void *mem_ctx, const struct ldb_val *val);
-+/* Function types */
-
-+struct ldb_map_attribute;
-+
-+typedef struct ldb_parse_tree *(*ldb_map_convert_operator_func)(const struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const struct ldb_parse_tree *tree);
-+
-+typedef struct ldb_val (*ldb_map_convert_func)(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const struct ldb_val *val);
-+
-+typedef struct ldb_message_element *(*ldb_map_generate_local_func)(struct ldb_module *module, void *mem_ctx, const struct ldb_map_attribute *map, const char *remote_attr,const struct ldb_message *remote_message);
-+
-+typedef void (*ldb_map_generate_remote_func)(struct ldb_module *module, const struct ldb_map_attribute *map, const char *local_attr, const struct ldb_message *old_message, struct ldb_message *remote_message, struct ldb_message *local_message);
-+
- #define LDB_MAP_MAX_REMOTE_NAMES 10
-
- /* map from local to remote attribute */
-@@ -66,9 +75,12 @@
- Used for generating attributes based on
- multiple remote attributes. */
- } type;
--
-+
-+ /* additional private data */
-+ void *private_data;
-+
- /* if set, will be called for search expressions that contain this attribute */
-- struct ldb_parse_tree *(*convert_operator)(const struct ldb_map_context *, TALLOC_CTX *ctx, const struct ldb_parse_tree *);
-+ ldb_map_convert_operator_func convert_operator;
-
- union {
- struct {
-@@ -89,10 +101,10 @@
-
- struct {
- /* Generate the local attribute from remote message */
-- struct ldb_message_element *(*generate_local)(struct ldb_module *, TALLOC_CTX *mem_ctx, const char *remote_attr, const struct ldb_message *remote);
-+ ldb_map_generate_local_func generate_local;
-
- /* Update remote message with information from local message */
-- void (*generate_remote)(struct ldb_module *, const char *local_attr, const struct ldb_message *old, struct ldb_message *remote, struct ldb_message *local);
-+ ldb_map_generate_remote_func generate_remote;
-
- /* Name(s) for this attribute on the remote server. This is an array since
- * one local attribute's data can be split up into several attributes
Deleted: branches/SOC/mkhl/ejs-map/samba3sam.c-privdat.patch
===================================================================
--- branches/SOC/mkhl/ejs-map/samba3sam.c-privdat.patch 2006-08-21 14:32:59 UTC (rev 17663)
+++ branches/SOC/mkhl/ejs-map/samba3sam.c-privdat.patch 2006-08-21 14:35:04 UTC (rev 17664)
@@ -1,73 +0,0 @@
-Index: dsdb/samdb/ldb_modules/samba3sam.c
-===================================================================
---- dsdb/samdb/ldb_modules/samba3sam.c (revision 17506)
-+++ dsdb/samdb/ldb_modules/samba3sam.c (working copy)
-@@ -52,7 +52,7 @@
- /* In Samba4 but not in Samba3:
- */
-
--static struct ldb_message_element *generate_primaryGroupID(struct ldb_module *module, TALLOC_CTX *ctx, const char *attr, const struct ldb_message *remote)
-+static struct ldb_message_element *generate_primaryGroupID(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_map_attribute *map, const char *attr, const struct ldb_message *remote)
- {
- struct ldb_message_element *el;
- const char *sid = ldb_msg_find_string(remote, attr, NULL);
-@@ -73,7 +73,7 @@
- return el;
- }
-
--static void generate_sambaPrimaryGroupSID(struct ldb_module *module, const char *local_attr, const struct ldb_message *local, struct ldb_message *remote_mp, struct ldb_message *remote_fb)
-+static void generate_sambaPrimaryGroupSID(struct ldb_module *module, const struct ldb_map_attribute *map, const char *local_attr, const struct ldb_message *local, struct ldb_message *remote_mp, struct ldb_message *remote_fb)
- {
- const struct ldb_val *sidval;
- char *sidstring;
-@@ -106,12 +106,12 @@
- talloc_free(sidstring);
- }
-
--static struct ldb_val convert_uid_samaccount(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
-+static struct ldb_val convert_uid_samaccount(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_map_attribute *map, const struct ldb_val *val)
- {
- return ldb_val_dup(ctx, val);
- }
-
--static struct ldb_val lookup_homedir(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
-+static struct ldb_val lookup_homedir(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_map_attribute *map, const struct ldb_val *val)
- {
- struct passwd *pwd;
- struct ldb_val retval;
-@@ -129,7 +129,7 @@
- return retval;
- }
-
--static struct ldb_val lookup_gid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
-+static struct ldb_val lookup_gid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_map_attribute *map, const struct ldb_val *val)
- {
- struct passwd *pwd;
- struct ldb_val retval;
-@@ -146,7 +146,7 @@
- return retval;
- }
-
--static struct ldb_val lookup_uid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
-+static struct ldb_val lookup_uid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_map_attribute *map, const struct ldb_val *val)
- {
- struct passwd *pwd;
- struct ldb_val retval;
-@@ -163,7 +163,7 @@
- return retval;
- }
-
--static struct ldb_val encode_sid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
-+static struct ldb_val encode_sid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_map_attribute *map, const struct ldb_val *val)
- {
- struct dom_sid *sid = dom_sid_parse_talloc(ctx, (char *)val->data);
- struct ldb_val *out = talloc_zero(ctx, struct ldb_val);
-@@ -182,7 +182,7 @@
- return *out;
- }
-
--static struct ldb_val decode_sid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
-+static struct ldb_val decode_sid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_map_attribute *map, const struct ldb_val *val)
- {
- struct dom_sid *sid;
- NTSTATUS status;
More information about the samba-cvs
mailing list