partial fix to ITS#3659; still problems in merging values with "permissive" set

[openldap] / servers / slapd / overlays / denyop.c

diff --git a/servers/slapd/overlays/denyop.c b/servers/slapd/overlays/denyop.c
index 03a0524809b6fc6545dfae78730656001589f61e..759a831d8db262db76325d46881f0c2d0a9b8de7 100644 (file)
--- a/servers/slapd/overlays/denyop.c
+++ b/servers/slapd/overlays/denyop.c
@@ -1,7 +1,7 @@
 /* denyop.c - Denies operations */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -186,9 +186,9 @@ denyop_config(
 
                        } else {
                                Debug( LDAP_DEBUG_ANY, "%s: line %d: "
-                                       "unknown operation \"%s\" "
+                                       "unknown operation \"%s\" at "
                                        "\"denyop <op-list>\" line.\n",
-                                       op, fname, lineno );
+                                       fname, lineno, op );
                                return( 1 );
                        }
 
@@ -224,7 +224,8 @@ denyop_destroy(
 static slap_overinst denyop;
 
 int
-denyop_init() {
+denyop_init( void )
+{
        memset( &denyop, 0, sizeof( slap_overinst ) );
        denyop.on_bi.bi_type = "denyop";
        denyop.on_bi.bi_db_init = denyop_over_init;
@@ -248,9 +249,10 @@ denyop_init() {
 
 #if SLAPD_OVER_DENYOP == SLAPD_MOD_DYNAMIC
 int
-init_module(int argc, char *argv[]) {
+init_module( int argc, char *argv[] )
+{
        return denyop_init();
 }
-#endif
+#endif /* SLAPD_OVER_DENYOP == SLAPD_MOD_DYNAMIC */
 
 #endif /* defined(SLAPD_OVER_DENYOP) */