Attachment 311516 Details for Bug 428765 – diffs

[patch] diffs

diffs.bug428765 (text/plain), 2.41 KB, created by Rich Megginson on 2008-07-10 21:59:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-07-10 21:59:46 UTC

Size: 2.41 KB

patch

obsolete

>Index: ldapserver/ldap/servers/plugins/bitwise/bitwise.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/bitwise/bitwise.c,v
>retrieving revision 1.2
>diff -u -8 -r1.2 bitwise.c
>--- ldapserver/ldap/servers/plugins/bitwise/bitwise.c	18 Oct 2007 00:08:28 -0000	1.2
>+++ ldapserver/ldap/servers/plugins/bitwise/bitwise.c	10 Jul 2008 21:56:14 -0000
>@@ -162,42 +162,43 @@
>     auto char* mrOID = NULL;
>     auto char* mrTYPE = NULL;
>     auto struct berval* mrVALUE = NULL;
> 
>     if (!slapi_pblock_get (pb, SLAPI_PLUGIN_MR_OID, &mrOID) && mrOID != NULL &&
> 	!slapi_pblock_get (pb, SLAPI_PLUGIN_MR_TYPE, &mrTYPE) && mrTYPE != NULL &&
> 	!slapi_pblock_get (pb, SLAPI_PLUGIN_MR_VALUE, &mrVALUE) && mrVALUE != NULL) {
> 
>-	struct bitwise_match_cb *bmc = new_bitwise_match_cb(mrTYPE, mrVALUE);
>-	slapi_pblock_set (pb, SLAPI_PLUGIN_OBJECT, bmc);
>-	slapi_pblock_set (pb, SLAPI_PLUGIN_DESTROY_FN, (void*)bitwise_filter_destroy);
>+	struct bitwise_match_cb *bmc = NULL;
> 	if (strcmp(mrOID, "1.2.840.113556.1.4.803") == 0) {
> 	    slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_MATCH_FN, (void*)bitwise_filter_match_and);
> 	} else if (strcmp(mrOID, "1.2.840.113556.1.4.804") == 0) {
> 	    slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_MATCH_FN, (void*)bitwise_filter_match_or);
>+	} else { /* this oid not handled by this plugin */
>+	    LDAPDebug (LDAP_DEBUG_FILTER, "=> bitwise_filter_create OID (%s) not handled\n", mrOID, 0, 0);
>+	    return rc;
> 	}
>+	bmc = new_bitwise_match_cb(mrTYPE, mrVALUE);
>+	slapi_pblock_set (pb, SLAPI_PLUGIN_OBJECT, bmc);
>+	slapi_pblock_set (pb, SLAPI_PLUGIN_DESTROY_FN, (void*)bitwise_filter_destroy);
> 	rc = LDAP_SUCCESS;
>     } else {
> 	LDAPDebug (LDAP_DEBUG_FILTER, "=> bitwise_filter_create missing parameter(s)\n", 0, 0, 0);
>     }
>     LDAPDebug (LDAP_DEBUG_FILTER, "<= bitwise_filter_create %i\n", rc, 0, 0);
>     return LDAP_SUCCESS;
> }
> 
> static Slapi_PluginDesc pdesc = { "bitwise", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
>               "bitwise match plugin" };
> 
> int /* LDAP error code */
> bitwise_init (Slapi_PBlock* pb)
> {
>     int rc;
>-    int argc;
>-    char** argv;
>-    char* cfgpath;
> 
>     rc = slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_CREATE_FN, (void*)bitwise_filter_create);
>     if ( rc == 0 ) {
> 	rc = slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&pdesc );
>     }
>     LDAPDebug (LDAP_DEBUG_FILTER, "bitwise_init %i\n", rc, 0, 0);
>     return rc;
> }

Actions: View | Diff

Attachments on bug 428765: 311516 | 311788