More places where LOCK_ID() calls need to be checked.

[openldap] / servers / slapd / shell-backends / shellutil.c

diff --git a/servers/slapd/shell-backends/shellutil.c b/servers/slapd/shell-backends/shellutil.c
index 1bbf55abcd52e2ccaa8f096a23b44ab2355b6154..246e93bc3e2ce6d9aadf567b0b81b39632d3cfb2 100644 (file)
--- a/servers/slapd/shell-backends/shellutil.c
+++ b/servers/slapd/shell-backends/shellutil.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  shellutil.c - common routines useful when building shell-based backends
                 for the standalone ldap server
@@ -88,7 +89,8 @@ write_entry( struct ldop *op, struct ldentry *entry, FILE *ofp )
 int
 test_filter( struct ldop *op, struct ldentry *entry )
 {
-    return (( random() & 0x07 ) == 0x07 );     /* XXX random for now */
+    return ((random() & 0x07 ) == 0x07) /* XXX random for now */
+               ? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
 }
 
 
@@ -139,7 +141,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
     struct inputparams *ip;
 
     if ( fgets( line, MAXLINELEN, ifp ) == NULL ) {
-       write_result( ofp, LDAP_OPERATIONS_ERROR, NULL, "Empty Input" );
+       write_result( ofp, LDAP_OTHER, NULL, "Empty Input" );
     }
     line[ strlen( line ) - 1 ] = '\0';
     if ( strncasecmp( line, STR_OP_SEARCH, sizeof( STR_OP_SEARCH ) - 1 )
@@ -172,7 +174,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
            if (( op->ldop_srch.ldsp_scope = atoi( args )) != LDAP_SCOPE_BASE &&
                    op->ldop_srch.ldsp_scope != LDAP_SCOPE_ONELEVEL &&
                    op->ldop_srch.ldsp_scope != LDAP_SCOPE_SUBTREE ) {
-               write_result( ofp, LDAP_OPERATIONS_ERROR, NULL, "Bad scope" );
+               write_result( ofp, LDAP_OTHER, NULL, "Bad scope" );
                return( -1 );
            }
            break;
@@ -212,7 +214,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
 
     if ( op->ldop_suffixes == NULL || op->ldop_dn == NULL ||
                op->ldop_srch.ldsp_filter == NULL ) {
-       write_result( ofp, LDAP_OPERATIONS_ERROR, NULL,
+       write_result( ofp, LDAP_OTHER, NULL,
                "Required suffix:, base:, or filter: missing" );
        return( -1 );
     }