NEX-15926 msgids make log entries harder to read
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>

*** 79,89 ****
                  ddi_remove_minor_node(devi, NULL);
                  return (DDI_FAILURE);
          }
          log_devi = devi;
          log_msgid = ddi_getprop(DDI_DEV_T_ANY, log_devi,
!             DDI_PROP_CANSLEEP, "msgid", 1);
          return (DDI_SUCCESS);
  }
  
  /*
   * log_open can be called for either /dev/log or dev/conslog.
--- 79,89 ----
                  ddi_remove_minor_node(devi, NULL);
                  return (DDI_FAILURE);
          }
          log_devi = devi;
          log_msgid = ddi_getprop(DDI_DEV_T_ANY, log_devi,
!             DDI_PROP_CANSLEEP, "msgid", 0);
          return (DDI_SUCCESS);
  }
  
  /*
   * log_open can be called for either /dev/log or dev/conslog.
*** 269,296 ****
          mblk_t *mp;
          char *msg, *msgid_start, *msgid_end;
          size_t idlen;
  
          while (canputnext(q) && (mp = getq(q)) != NULL) {
-                 if (log_msgid == 0) {
-                         /*
-                          * Strip out the message ID.  If it's a kernel
-                          * SL_CONSOLE message, replace msgid with "unix: ".
-                          */
                          msg = (char *)mp->b_cont->b_rptr;
!                         if ((msgid_start = strstr(msg, "[ID ")) != NULL &&
                              (msgid_end = strstr(msgid_start, "] ")) != NULL) {
!                                 log_ctl_t *lc = (log_ctl_t *)mp->b_rptr;
!                                 if ((lc->flags & SL_CONSOLE) &&
!                                     (lc->pri & LOG_FACMASK) == LOG_KERN)
!                                         msgid_start = msg + snprintf(msg,
!                                             7, "unix: ");
                                  idlen = msgid_end + 2 - msgid_start;
                                  ovbcopy(msg, msg + idlen, msgid_start - msg);
                                  mp->b_cont->b_rptr += idlen;
                          }
-                 }
                  mp->b_band = 0;
                  putnext(q, mp);
          }
          return (0);
  }
--- 269,287 ----
          mblk_t *mp;
          char *msg, *msgid_start, *msgid_end;
          size_t idlen;
  
          while (canputnext(q) && (mp = getq(q)) != NULL) {
                  msg = (char *)mp->b_cont->b_rptr;
!                 if (log_msgid == 0 &&
!                     (msgid_start = strstr(msg, "[ID ")) != NULL &&
                      (msgid_end = strstr(msgid_start, "] ")) != NULL) {
!                         /* Strip out the message ID */
                          idlen = msgid_end + 2 - msgid_start;
                          ovbcopy(msg, msg + idlen, msgid_start - msg);
                          mp->b_cont->b_rptr += idlen;
                  }
                  mp->b_band = 0;
                  putnext(q, mp);
          }
          return (0);
  }