randomness

3 files changed, 14 insertions, 15 deletions

diff --git a/lib/ZFmtAuth.c b/lib/ZFmtAuth.c
index 60669f3..e061b96 100644
--- a/lib/ZFmtAuth.c
+++ b/lib/ZFmtAuth.c
@@ -23,39 +23,37 @@ Code_t ZFormatAuthenticNotice(notice,buffer,buffer_len,len,session)
 	int		*len;
 	C_Block		session;
 {
+	ZNotice_t newnotice;
 	char *ptr;
 	int retval,hdrlen;
 
-	notice->z_auth = 1;
-	notice->z_authent_len = 0;
-	notice->z_ascii_authent = (char *)"";
+	newnotice = *notice;
+	newnotice.z_auth = 1;
+	newnotice.z_authent_len = 0;
+	newnotice.z_ascii_authent = (char *)"";
 	
-	if ((retval = Z_FormatRawHeader(notice,buffer,buffer_len,&hdrlen))
+	if ((retval = Z_FormatRawHeader(&newnotice,buffer,buffer_len,&hdrlen))
 	    != ZERR_NONE)
 		return (retval);
 
 	for (hdrlen--;buffer[hdrlen-1];hdrlen--)
 		;
 	
-/*	if (result = get_credentials(SERVER_SERVICE,SERVER_INSTANCE,
-			    __Zephyr_realm,&cred))
-		return (result+krb_err_base);
-*/
-	notice->z_checksum = (ZChecksum_t)quad_cksum(buffer,NULL,hdrlen,0,
+	newnotice.z_checksum = (ZChecksum_t)quad_cksum(buffer,NULL,hdrlen,0,
 						     session);
 
-	if ((retval = Z_FormatRawHeader(notice,buffer,buffer_len,&hdrlen))
+	if ((retval = Z_FormatRawHeader(&newnotice,buffer,buffer_len,&hdrlen))
 	    != ZERR_NONE)
 		return (retval);
 
 	ptr = buffer+hdrlen;
 
-	if (notice->z_message_len+hdrlen > buffer_len)
+	if (newnotice.z_message_len+hdrlen > buffer_len)
 		return (ZERR_PKTLEN);
 
-	bcopy(notice->z_message,ptr,notice->z_message_len);
+	bcopy(newnotice.z_message,ptr,newnotice.z_message_len);
 
-	*len = hdrlen+notice->z_message_len;
+	*len = hdrlen+newnotice.z_message_len;
 
 	if (*len > Z_MAXPKTLEN)
 		return (ZERR_PKTLEN);
diff --git a/lib/ZSendPkt.c b/lib/ZSendPkt.c
index f1d95a1..57f8470 100644
--- a/lib/ZSendPkt.c
+++ b/lib/ZSendPkt.c
@@ -37,7 +37,7 @@ Code_t ZSendPacket(packet,len)
 			return (retval);
 
 	if ((retval = Z_InternalParseNotice(packet,len,&notice,(int *)0,
-				   (struct sockaddr_in *)0),(int (*)())0)
+				   (struct sockaddr_in *)0,(int (*)())0))
 	    != ZERR_NONE)
 		return (retval);
 
diff --git a/lib/ZSubs.c b/lib/ZSubs.c
index a00c31c..8f309f0 100644
--- a/lib/ZSubs.c
+++ b/lib/ZSubs.c
@@ -67,7 +67,8 @@ Z_Subscriptions(sublist,nitems,port,opcode)
 	for (i=0;i<nitems;i++) {
 		list[i*3] = sublist[i].class;
 		list[i*3+1] = sublist[i].classinst;
-		if (sublist[i].recipient && *sublist[i].recipient)
+		if (sublist[i].recipient && *sublist[i].recipient &&
+		    *sublist[i].recipient != '*')
 			list[i*3+2] = ZGetSender();
 		else
 			list[i*3+2] = "";