[1660] in Moira
Re: (undesired?) blanche change
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Thu Aug 24 11:59:43 2000
Message-Id: <200008241559.LAA02344@riff-raff-w20.mit.edu>
To: Laura Baldwin <boojum@MIT.EDU>
Cc: moiradev@MIT.EDU
In-Reply-To: Your message of "Thu, 24 Aug 2000 09:32:43 EDT."
<200008241332.JAA04742@never-never-land.mit.edu>
Date: Thu, 24 Aug 2000 11:59:31 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Adding the warning for non-qualified strings was intentional;
removing the behavior of returning MR_NO_MATCH in the M_ANY case
wasn't. Here's a patch (this doesn't include the addition of MRCL_WARN
to mrclient.h)
Garry
Index: blanche/blanche.c
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/clients/blanche/blanche.c,v
retrieving revision 1.52
diff -c -r1.52 blanche.c
*** blanche/blanche.c 2000/08/21 04:54:45 1.52
--- blanche/blanche.c 2000/08/24 15:37:48
***************
*** 660,678 ****
}
case M_STRING:
status = mrcl_validate_string_member(memberstruct->name);
! mrcl_com_err(whoami);
! if (status == MRCL_REJECT)
! {
! success = 0;
! break;
! }
! else if (memberstruct->type == M_ANY && status != MR_SUCCESS)
{
/* if user is trying to add something which isn't a
remote string, or a list, or a user, and didn't
explicitly specify `STRING:', it's probably a typo */
com_err(whoami, MR_NO_MATCH, "while adding member %s to %s",
memberstruct->name, listname);
success = 0;
break;
}
--- 660,680 ----
}
case M_STRING:
status = mrcl_validate_string_member(memberstruct->name);
! if (memberstruct->type == M_ANY && status == MRCL_WARN)
{
/* if user is trying to add something which isn't a
remote string, or a list, or a user, and didn't
explicitly specify `STRING:', it's probably a typo */
com_err(whoami, MR_NO_MATCH, "while adding member %s to %s",
memberstruct->name, listname);
+ success = 0;
+ break;
+ }
+ else
+ mrcl_com_err(whoami);
+
+ if (status == MRCL_REJECT)
+ {
success = 0;
break;
}
Index: lib/member.c
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/clients/lib/member.c,v
retrieving revision 1.2
diff -c -r1.2 member.c
*** lib/member.c 2000/08/21 04:54:26 1.2
--- lib/member.c 2000/08/24 15:07:20
***************
*** 48,54 ****
mrcl_set_message("STRING \"%s\" is not a foreign mail address.\nAdding "
"it to a mailing list may cause the list to break.",
str);
! return MRCL_SUCCESS;
}
mrcl_clear_message();
--- 48,54 ----
mrcl_set_message("STRING \"%s\" is not a foreign mail address.\nAdding "
"it to a mailing list may cause the list to break.",
str);
! return MRCL_WARN;
}
mrcl_clear_message();
