Rework Modify statslog too

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index e2a6172ba5b4ab88283f201ec2020f0f49851ed5..81542f898e11cee62ffa67661d39cec981d4b53f 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -131,36 +131,42 @@ do_modify(
        }
 
        if ( StatslogTest( LDAP_DEBUG_STATS ) ) {
-               char abuf[BUFSIZ/2], *ptr = abuf;
-               int len = 0;
+               char *ptr;
+               unsigned len = 0, alen;
 
-               Statslog( LDAP_DEBUG_STATS, "%s MOD dn=\"%s\"\n",
-                       op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
+               ptr = op->o_logptr;
+               ptr += snprintf( ptr, LOGBUFSIZ - (ptr - op->o_logbuf),
+                       " MOD dn=\"%s\"\n",
+                       op->o_req_dn.bv_val );
 
+               len = ptr - op->o_logbuf;
+               if ( op->orm_modlist ) {
+                       ptr += snprintf( ptr, LOGBUFSIZ - len, " MOD attr=" );
+                       len = ptr - op->o_logbuf;
+               }
                for ( tmp = op->orm_modlist; tmp != NULL; tmp = tmp->sml_next ) {
-                       if (len + 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
-                               Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
-                                   op->o_log_prefix, abuf, 0, 0, 0 );
-
-                               len = 0;
-                               ptr = abuf;
-
-                               if( 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
-                                       Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
-                                               op->o_log_prefix, tmp->sml_type.bv_val, 0, 0, 0 );
-                                       continue;
-                               }
-                       }
-                       if (len) {
-                               *ptr++ = ' ';
-                               len++;
+                       alen = tmp->sml_type.bv_len;
+                       if ( alen >= 256 )
+                               alen = 255;
+                       if (len + 1 + alen >= LOGBUFSIZ ) {
+                               if ( ldap_debug & LDAP_DEBUG_STATS )
+                                       lutil_debug( ldap_debug, LDAP_DEBUG_STATS, "%s", op->o_log_prefix );
+                               if ( ldap_syslog & LDAP_DEBUG_STATS )
+                                       sendlog( op->o_logbuf, ptr - op->o_logbuf );
+                               ptr = lutil_strcopy( op->o_logptr, " MOD attr=" );
+                               len = ptr - op->o_logbuf;
                        }
-                       ptr = lutil_strcopy(ptr, tmp->sml_type.bv_val);
-                       len += tmp->sml_type.bv_len;
+                       ptr = lutil_strncopy( ptr, tmp->sml_type.bv_val, alen );
+                       len += alen;
+                       *ptr++ = ' ';
+                       *ptr = '\0';
                }
-               if (len) {
-                       Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
-                               op->o_log_prefix, abuf, 0, 0, 0 );
+               if ( ptr != op->o_logptr ) {
+                       if ( ldap_debug & LDAP_DEBUG_STATS )
+                               lutil_debug( ldap_debug, LDAP_DEBUG_STATS, "%s", op->o_log_prefix );
+                       if ( ldap_syslog & LDAP_DEBUG_STATS )
+                               sendlog( op->o_logbuf, ptr - op->o_logbuf );
+                       *op->o_logptr = '\0';
                }
        }
 #endif /* LDAP_DEBUG */

diff --git a/servers/slapd/syslog.c b/servers/slapd/syslog.c
index e65e93274a663cbe121fd3285d998c26fe0b7ad3..20d16ec9e24e428ee634a9dc995c5f6c468dd982 100644 (file)
--- a/servers/slapd/syslog.c
+++ b/servers/slapd/syslog.c
@@ -156,6 +156,7 @@ sendlog(char *tbuf, int cnt)
                openlog(LogTag, LogStat, 0);
        connectlog();
 
+#if 1
        /*
         * If the send() failed, there are two likely scenarios:
         *  1) syslogd was restarted
@@ -175,6 +176,7 @@ sendlog(char *tbuf, int cnt)
                                break;
                } while (errno == ENOBUFS);
        }
+#endif
 }
 
 static void