ANU News Patch
Patch ID: 930520_newsadd.c!mark.martinec@ijs.si
Date: 20-May-1993
Author: Mark Martinec  mark.martinec@ijs.si
News Version: 6.1beta7
News Files: NewsAdd.C
Description: Corrects some of the error messages put in place by patch
920417_newsadd.c!ewilts@galaxy.gov.bc.ca, and adds additional information to
others.
Requires: 920417_newsadd.c!ewilts@galaxy.gov.bc.ca
*** newsadd.c
--- newsadd_new.c
**************
*** 173,175
  **--
  **/
  
--- 173,177 -----
+ **	V6.1b7	20-May-1993	Mark.Martinec@ijs.si
+ **	  - fixed errors in warning messages from 17-Apr-1992 patch; enhanced others
  **--
  **/
  
**************
*** 490,496
      }
  /* printf("Add %s %s %s",recvfrom,itm[MESSAGE_ID],newsgroup); */
    if (!strcmp(newsgroup,"junk") && !junk_it) {
!     printf(": REJECT (/NOJUNK)\n");
      return;
      }
    if (!*newsgroup) {
--- 492,498 -----
      }
  /* printf("Add %s %s %s",recvfrom,itm[MESSAGE_ID],newsgroup); */
    if (!strcmp(newsgroup,"junk") && !junk_it) {
!     printf("%s %s: REJECT (No Newsgroup/NOJUNK)\n",itm[MESSAGE_ID],newsgroup);
      return;
      }
    if (!*newsgroup) {
**************
*** 502,508
      strcpy(newsgroup,junk);
      }
    if (!*itm[MESSAGE_ID]) {
!     printf("%s %s: REJECT (Path Loop)\n",itm[MESSAGE_ID],newsgroup);
      return;
      }
  
--- 504,510 -----
      strcpy(newsgroup,junk);
      }
    if (!*itm[MESSAGE_ID]) {
!     printf("%s %s: REJECT (No Message-ID)\n","<>",newsgroup);
      return;
      }
  
**************
*** 508,514
  
  #if SELF_PATH_CHECK
    if (!skip_loop_test && !mod_add && path_match(itm[PATH],news_pathname)) {
!     printf("%s %s: JUNK (SYS filter)\n",itm[MESSAGE_ID],newsgroup);
      return;
      }
  #endif
--- 510,516 -----
  
  #if SELF_PATH_CHECK
    if (!skip_loop_test && !mod_add && path_match(itm[PATH],news_pathname)) {
!     printf("%s %s: REJECT (Path Loop)\n",itm[MESSAGE_ID],newsgroup);
      return;
      }
  #endif
**************
*** 515,521
  
    if (!sys_local_accept(newsgroup,itm[DISTRIBUTION]) && strcmp(newsgroup,junk)) {
      if (!junk_it) {
!       printf(": REJECT (SYS filter)\n");
        return;
        }
      printf("%s %s: JUNK (SYS filter)\n",itm[MESSAGE_ID],newsgroup);
--- 517,523 -----
  
    if (!sys_local_accept(newsgroup,itm[DISTRIBUTION]) && strcmp(newsgroup,junk)) {
      if (!junk_it) {
!       printf("%s %s: REJECT (SYS filter)\n",itm[MESSAGE_ID],newsgroup);
        return;
        }
      printf("%s %s: JUNK (SYS filter)\n",itm[MESSAGE_ID],newsgroup);
**************
*** 531,537
      strcpy(newsgroup,junk);
      do_new_group(newsgroup,0,cre_grp);
      }
!   if ((!*cre_grp) && (!strcmp(newsgroup,junk))) printf("%s %s: REJECT (No JUNK)\n",itm[MESSAGE_ID],newsgroup);
    *itm_fname = '\0';
    status = 0;
    if (*cre_grp) {
--- 533,540 -----
      strcpy(newsgroup,junk);
      do_new_group(newsgroup,0,cre_grp);
      }
!   if ((!*cre_grp) && (!strcmp(newsgroup,junk)))
!     printf("%s %s: REJECT (No JUNK)\n",itm[MESSAGE_ID],newsgroup);
    *itm_fname = '\0';
    status = 0;
    if (*cre_grp) {
*** patchlist.h;-1
--- patchlist.h
**************
*** 1,1
  =+=+= End =+=+=
--- 1,2 -----
+ 930520_newsadd.c!mark.martinec@ijs.si
  =+=+= End =+=+=