Index: ossp-pkg/petidomo/subscribe.c
RCS File: /v/ossp/cvs/ossp-pkg/petidomo/subscribe.c,v
rcsdiff -q -kk '-r1.22' '-r1.23' -u '/v/ossp/cvs/ossp-pkg/petidomo/subscribe.c,v' 2>/dev/null
--- subscribe.c	2001/01/20 15:03:11	1.22
+++ subscribe.c	2004/03/19 15:39:21	1.23
@@ -215,6 +215,7 @@
 	/* Require approval. */
 
 	char* command;
+        char  c;
 	char* cookie;
 
 	syslog(LOG_INFO, "%s: Attempt to subscribe \"%s\" to list \"%s\" deferred, because the " \
@@ -240,16 +241,20 @@
 	    if (strcasecmp(address, originator) == 0)
 		buffer = text_easy_sprintf("You requested that the address \"%s\" should be subscribed to " \
 					   "the mailing list \"%s\". This will not happen unless you approve the " \
-					   "request by replying to this mail and citing the string",
+					   "request by replying to this mail and concatenating the following two strings into one",
 					   address, listname);
 	    else
 		buffer = text_easy_sprintf("Per request from \"%s\", the address \"%s\" should be subscribed to " \
 					   "the mailing list \"%s\". This will not happen unless you approve the " \
-					   "request by replying to this mail and citing the string",
+					   "request by replying to this mail and concatenating the following two strings into one",
 					   originator, address, listname);
 	    text_wordwrap(buffer, 70);
 	    fprintf(fh, "%s\n", buffer);
-	    fprintf(fh, "\n    %s\n\n", cookie);
+	    fprintf(fh, "\n");
+	    c = cookie[16];
+ 	    cookie[16] = '\0'; fprintf(fh, "    %s\n", &cookie[ 0]);
+ 	    cookie[16] = c;    fprintf(fh, "    %s\n", &cookie[16]);
+	    fprintf(fh, "\n");
 	    fprintf(fh, "in your reply.\n");
 	    CloseMailer(fh);
 
Index: ossp-pkg/petidomo/unsubscribe.c
RCS File: /v/ossp/cvs/ossp-pkg/petidomo/unsubscribe.c,v
rcsdiff -q -kk '-r1.20' '-r1.21' -u '/v/ossp/cvs/ossp-pkg/petidomo/unsubscribe.c,v' 2>/dev/null
--- unsubscribe.c	2001/01/20 15:03:11	1.20
+++ unsubscribe.c	2004/03/19 15:39:21	1.21
@@ -218,6 +218,7 @@
 	    /* Require approval. */
 
 	    char* command;
+        char  c;
 	    char* cookie;
 
 	    syslog(LOG_INFO, "%s: Attempt to unsubscribe \"%s\" from list \"%s\" deferred, because the " \
@@ -243,16 +244,20 @@
 		if (strcasecmp(address, originator) == 0)
 		    buffer = text_easy_sprintf("You requested that the address \"%s\" should be unsubscribed from " \
 					       "the mailing list \"%s\". This will not happen unless you approve the " \
-					       "request by replying to this mail and citing the string",
+					   "request by replying to this mail and concatenating the following two strings into one",
 					       originator, address, listname);
 		else
 		    buffer = text_easy_sprintf("Per request from \"%s\", the address \"%s\" should be unsubscribed from " \
 					       "the mailing list \"%s\". This will not happen unless you approve the " \
-					       "request by replying to this mail and citing the string",
+					   "request by replying to this mail and concatenating the following two strings into one",
 					       originator, address, listname);
 		text_wordwrap(buffer, 70);
-		fprintf(fh, "%s\n", buffer);
-		fprintf(fh, "\n    %s\n\n", cookie);
+	    fprintf(fh, "%s\n", buffer);
+	    fprintf(fh, "\n");
+	    c = cookie[16];
+ 	    cookie[16] = '\0'; fprintf(fh, "    %s\n", &cookie[ 0]);
+ 	    cookie[16] = c;    fprintf(fh, "    %s\n", &cookie[16]);
+	    fprintf(fh, "\n");
 		fprintf(fh, "in your reply.\n");
 		CloseMailer(fh);
 		}