diff options
-rw-r--r-- | lib/ZClosePort.c | 2 | ||||
-rw-r--r-- | lib/ZCmpUID.c | 2 | ||||
-rw-r--r-- | lib/ZFlsLocs.c | 2 | ||||
-rw-r--r-- | lib/ZGetSender.c | 5 | ||||
-rw-r--r-- | lib/ZInit.c | 6 | ||||
-rw-r--r-- | lib/ZLocateU.c | 12 | ||||
-rw-r--r-- | lib/ZLocations.c | 3 | ||||
-rw-r--r-- | lib/ZMakeAscii.c | 4 | ||||
-rw-r--r-- | lib/ZOpenPort.c | 8 | ||||
-rw-r--r-- | lib/ZParseNot.c | 27 | ||||
-rw-r--r-- | lib/ZPeekPkt.c | 2 | ||||
-rw-r--r-- | lib/ZPending.c | 2 | ||||
-rw-r--r-- | lib/ZReadAscii.c | 2 | ||||
-rw-r--r-- | lib/ZRecvPkt.c | 4 | ||||
-rw-r--r-- | lib/ZSendPkt.c | 14 | ||||
-rw-r--r-- | lib/ZSetFD.c | 2 |
16 files changed, 56 insertions, 41 deletions
diff --git a/lib/ZClosePort.c b/lib/ZClosePort.c index 27e7e18..4f93d46 100644 --- a/lib/ZClosePort.c +++ b/lib/ZClosePort.c @@ -19,7 +19,7 @@ Code_t ZClosePort() { if (__Zephyr_fd >= 0 && __Zephyr_open) - close(__Zephyr_fd); + (void) close(__Zephyr_fd); __Zephyr_fd = -1; __Zephyr_open = 0; diff --git a/lib/ZCmpUID.c b/lib/ZCmpUID.c index bda3680..d0f584c 100644 --- a/lib/ZCmpUID.c +++ b/lib/ZCmpUID.c @@ -19,5 +19,5 @@ int ZCompareUID(uid1,uid2) ZUnique_Id_t *uid1,*uid2; { - return (!bcmp(uid1,uid2,sizeof (*uid1))); + return (!bcmp((char *)uid1,(char *)uid2,sizeof (*uid1))); } diff --git a/lib/ZFlsLocs.c b/lib/ZFlsLocs.c index 40a9c43..66ee52d 100644 --- a/lib/ZFlsLocs.c +++ b/lib/ZFlsLocs.c @@ -28,7 +28,7 @@ Code_t ZFlushLocations() free(__locate_list[i].time); } - free(__locate_list); + free((char *)__locate_list); __locate_list = 0; __locate_num = 0; diff --git a/lib/ZGetSender.c b/lib/ZGetSender.c index bee171a..2e88390 100644 --- a/lib/ZGetSender.c +++ b/lib/ZGetSender.c @@ -31,15 +31,16 @@ char *ZGetSender() tktfile = (char *)TKT_FILE; if (!(fp = fopen(tktfile,"r"))) { + /*NOSTRICT*/ pw = getpwuid(getuid()); if (!pw) return ("unauth"); - sprintf(sender,"%s@UNAUTH",pw->pw_name); + (void) sprintf(sender,"%s@UNAUTH",pw->pw_name); return (sender); } getst(fp,pname,ANAME_SZ); getst(fp,pinst,INST_SZ); - sprintf(sender,"%s%s%s@%s",pname,(pinst[0]?".":""),pinst, + (void) sprintf(sender,"%s%s%s@%s",pname,(pinst[0]?".":""),pinst, __Zephyr_realm); return (sender); diff --git a/lib/ZInit.c b/lib/ZInit.c index 9657436..11257bb 100644 --- a/lib/ZInit.c +++ b/lib/ZInit.c @@ -26,7 +26,7 @@ Code_t ZInitialize() init_zeph_err_tbl(); init_krb_err_tbl(); - bzero(&__HM_addr,sizeof(__HM_addr)); + bzero((char *)&__HM_addr,sizeof(__HM_addr)); __HM_addr.sin_family = AF_INET; @@ -42,12 +42,12 @@ Code_t ZInitialize() __HM_addr.sin_port = hmserv->s_port; - bcopy(addr,&__HM_addr.sin_addr,4); + bcopy(addr,(char *)&__HM_addr.sin_addr,4); __HM_set = 0; if (get_krbrlm(__Zephyr_realm,1) != KSUCCESS) - strcpy(__Zephyr_realm,"NOREALM"); + (void)strcpy(__Zephyr_realm,"NOREALM"); return (ZERR_NONE); } diff --git a/lib/ZLocateU.c b/lib/ZLocateU.c index 351ad09..abe537e 100644 --- a/lib/ZLocateU.c +++ b/lib/ZLocateU.c @@ -65,21 +65,23 @@ Code_t ZLocateUser(user,nlocs) __locate_num /= 2; - __locate_list = (ZLocations_t *)malloc(__locate_num* + __locate_list = (ZLocations_t *)malloc((unsigned)__locate_num* sizeof(ZLocations_t)); if (!__locate_list) return (ENOMEM); for (ptr=retnotice.z_message,i=0;i<__locate_num;i++) { - __locate_list[i].host = (char *)malloc(strlen(ptr)+1); + __locate_list[i].host = (char *)malloc((unsigned)strlen(ptr)+ + 1); if (!__locate_list[i].host) return (ENOMEM); - strcpy(__locate_list[i].host,ptr); + (void) strcpy(__locate_list[i].host,ptr); ptr += strlen(ptr)+1; - __locate_list[i].time = (char *)malloc(strlen(ptr)+1); + __locate_list[i].time = (char *)malloc((unsigned)strlen(ptr)+ + 1); if (!__locate_list[i].time) return (ENOMEM); - strcpy(__locate_list[i].time,ptr); + (void) strcpy(__locate_list[i].time,ptr); ptr += strlen(ptr)+1; } diff --git a/lib/ZLocations.c b/lib/ZLocations.c index 9530c08..6fcb85a 100644 --- a/lib/ZLocations.c +++ b/lib/ZLocations.c @@ -26,8 +26,9 @@ Code_t ZSetLocation() struct passwd *pw; quiet = 0; + /*NOSTRICT*/ if (pw = getpwuid(getuid())) { - sprintf(bfr,"%s/.hideme",pw->pw_dir); + (void) sprintf(bfr,"%s/.hideme",pw->pw_dir); quiet = !access(bfr,F_OK); } diff --git a/lib/ZMakeAscii.c b/lib/ZMakeAscii.c index 2cdcf81..4745610 100644 --- a/lib/ZMakeAscii.c +++ b/lib/ZMakeAscii.c @@ -28,13 +28,13 @@ Code_t ZMakeAscii(ptr,len,field,num) if (!(i%4)) { if (len < 3+(i!=0)) return (ZERR_FIELDLEN); - sprintf(ptr,"%s0x",i?" ":""); + (void) sprintf(ptr,"%s0x",i?" ":""); ptr += 2+(i!=0); len -= 2+(i!=0); } if (len < 3) return (ZERR_FIELDLEN); - sprintf(ptr,"%02x",field[i]); + (void) sprintf(ptr,"%02x",field[i]); ptr += 2; len -= 2; } diff --git a/lib/ZOpenPort.c b/lib/ZOpenPort.c index 9374b78..9785291 100644 --- a/lib/ZOpenPort.c +++ b/lib/ZOpenPort.c @@ -23,7 +23,7 @@ Code_t ZOpenPort(port) int retval; struct sockaddr_in bindin; - ZClosePort(); + (void) ZClosePort(); if ((__Zephyr_fd = socket(AF_INET,SOCK_DGRAM,0)) < 0) { __Zephyr_fd = -1; @@ -35,8 +35,9 @@ Code_t ZOpenPort(port) if (port && *port) bindin.sin_port = *port; else - bindin.sin_port = htons(((getpid()*8)&0xfff)+ - ((random()>>4)&0xf)+1024); + /*NOSTRICT*/ + bindin.sin_port = htons((u_short)((getpid()*8)&0xfff)+ + (((int)random()>>4)&0xf)+1024); bindin.sin_addr.s_addr = INADDR_ANY; @@ -46,6 +47,7 @@ Code_t ZOpenPort(port) if (port) return (ZERR_PORTINUSE); else + /*NOSTRICT*/ bindin.sin_port = htons(ntohs(bindin. sin_port) +1); diff --git a/lib/ZParseNot.c b/lib/ZParseNot.c index 692366a..d0c84b3 100644 --- a/lib/ZParseNot.c +++ b/lib/ZParseNot.c @@ -34,34 +34,36 @@ Code_t ZParseNotice(buffer,len,notice,auth,from) ptr = buffer; end = buffer+len; - if (ZReadAscii(ptr,end-ptr,temp,sizeof(int)) == ZERR_BADFIELD) + if (ZReadAscii(ptr,end-ptr,(char *)temp,sizeof(int)) == ZERR_BADFIELD) return (ZERR_BADPKT); ptr += strlen(ptr)+1; if (*temp != ZVERSION) return (ZERR_VERS); - if (ZReadAscii(ptr,end-ptr,temp,sizeof(int)) == ZERR_BADFIELD) + if (ZReadAscii(ptr,end-ptr,(char *)temp,sizeof(int)) == ZERR_BADFIELD) return (ZERR_BADPKT); notice->z_kind = (ZNotice_Kind_t)*temp; ptr += strlen(ptr)+1; - if (ZReadAscii(ptr,end-ptr,temp,sizeof(ZUnique_Id_t)) == ZERR_BADFIELD) + if (ZReadAscii(ptr,end-ptr,(char *)temp,sizeof(ZUnique_Id_t)) == + ZERR_BADFIELD) return (ZERR_BADPKT); - bcopy(temp,¬ice->z_uid,sizeof(ZUnique_Id_t)); + bcopy((char *)temp,(char *)¬ice->z_uid,sizeof(ZUnique_Id_t)); ptr += strlen(ptr)+1; - if (ZReadAscii(ptr,end-ptr,temp,sizeof(u_short)) == ZERR_BADFIELD) + if (ZReadAscii(ptr,end-ptr,(char *)temp,sizeof(u_short)) == + ZERR_BADFIELD) return (ZERR_BADPKT); notice->z_port = (u_short)*temp; ptr += strlen(ptr)+1; - if (ZReadAscii(ptr,end-ptr,temp,sizeof(int)) == ZERR_BADFIELD) + if (ZReadAscii(ptr,end-ptr,(char *)temp,sizeof(int)) == ZERR_BADFIELD) return (ZERR_BADPKT); notice->z_auth = *temp; ptr += strlen(ptr)+1; - if (ZReadAscii(ptr,end-ptr,temp,sizeof(int)) == ZERR_BADFIELD) + if (ZReadAscii(ptr,end-ptr,(char *)temp,sizeof(int)) == ZERR_BADFIELD) return (ZERR_BADPKT); notice->z_authent_len = *temp; ptr += strlen(ptr)+1; @@ -81,7 +83,8 @@ Code_t ZParseNotice(buffer,len,notice,auth,from) cksum = ptr; - if (ZReadAscii(ptr,end-ptr,¬ice->z_checksum,sizeof(ZChecksum_t)) + if (ZReadAscii(ptr,end-ptr,(char *)¬ice->z_checksum, + sizeof(ZChecksum_t)) == ZERR_BADFIELD) return (ZERR_BADPKT); ptr += strlen(ptr)+1; @@ -98,7 +101,8 @@ Code_t ZParseNotice(buffer,len,notice,auth,from) if (__Zephyr_server) { if (ZReadAscii(notice->z_ascii_authent, - strlen(notice->z_ascii_authent)+1,authent.dat, + strlen(notice->z_ascii_authent)+1, + (char *)authent.dat, notice->z_authent_len) == ZERR_BADFIELD) { *auth = 0; return (ZERR_NONE); @@ -107,9 +111,10 @@ Code_t ZParseNotice(buffer,len,notice,auth,from) result = rd_ap_req(&authent,SERVER_SERVICE, SERVER_INSTANCE,from->sin_addr.s_addr, &dat,SERVER_SRVTAB); - bcopy(dat.session,__Zephyr_session,sizeof(C_Block)); + bcopy((char *)dat.session,(char *)__Zephyr_session, + sizeof(C_Block)); *auth = (result == RD_AP_OK); - sprintf(srcprincipal,"%s%s%s@%s",dat.pname, + (void) sprintf(srcprincipal,"%s%s%s@%s",dat.pname, dat.pinst[0]?".":"",dat.pinst,dat.prealm); if (strcmp(srcprincipal,notice->z_sender)) *auth = 0; diff --git a/lib/ZPeekPkt.c b/lib/ZPeekPkt.c index e74a3d2..af4f942 100644 --- a/lib/ZPeekPkt.c +++ b/lib/ZPeekPkt.c @@ -41,7 +41,7 @@ Code_t ZPeekPacket(buffer,buffer_len,ret_len,from) } bcopy(__Q_Head->packet,buffer,*ret_len); - bcopy(&__Q_Head->from,from,sizeof(struct sockaddr_in)); + bcopy((char *)&__Q_Head->from,(char *)from,sizeof(struct sockaddr_in)); return (retval); } diff --git a/lib/ZPending.c b/lib/ZPending.c index 047dcc3..e087a9a 100644 --- a/lib/ZPending.c +++ b/lib/ZPending.c @@ -21,7 +21,7 @@ int ZPending() if (ZGetFD() < 0) return (-1); - Z_ReadEnqueue(); + (void) Z_ReadEnqueue(); return(ZQLength()); } diff --git a/lib/ZReadAscii.c b/lib/ZReadAscii.c index f7a529b..fdcd2f7 100644 --- a/lib/ZReadAscii.c +++ b/lib/ZReadAscii.c @@ -42,7 +42,7 @@ int ZReadAscii(ptr,len,field,num) bfr[2] = '\0'; if (!bfr[0] || !bfr[1]) return (ZERR_BADFIELD); - sscanf(bfr,"%x",field+i); + (void) sscanf(bfr,"%x",field+i); ptr += 2; len -= 2; if (len < 1) diff --git a/lib/ZRecvPkt.c b/lib/ZRecvPkt.c index afa4e7a..fcd29af 100644 --- a/lib/ZRecvPkt.c +++ b/lib/ZRecvPkt.c @@ -43,9 +43,9 @@ Code_t ZReceivePacket(buffer,buffer_len,ret_len,from) } bcopy(__Q_Head->packet,buffer,*ret_len); - bcopy(&__Q_Head->from,from,sizeof(struct sockaddr_in)); + bcopy((char *)&__Q_Head->from,(char *)from,sizeof(struct sockaddr_in)); - Z_RemQueue(__Q_Head); + (void) Z_RemQueue(__Q_Head); return (retval); } diff --git a/lib/ZSendPkt.c b/lib/ZSendPkt.c index 0058eb3..eca41de 100644 --- a/lib/ZSendPkt.c +++ b/lib/ZSendPkt.c @@ -24,7 +24,8 @@ Code_t ZSendPacket(packet,len) Code_t retval; struct sockaddr_in dest; struct timeval tv; - int auth,t1,t2,t3,i; + int auth,i; + fd_set t1,t2,t3; ZPacket_t ackpack; ZNotice_t notice; @@ -32,16 +33,18 @@ Code_t ZSendPacket(packet,len) return (ZERR_ILLVAL); if (ZGetFD() < 0) - if ((retval = ZOpenPort(0)) != ZERR_NONE) + if ((retval = ZOpenPort((u_short *)0)) != ZERR_NONE) return (retval); + if ((retval = ZParseNotice(packet,len,¬ice,(int *)0, + (struct sockaddr_in *)0)) != ZERR_NONE) + return (retval); + dest = ZGetDestAddr(); if (sendto(ZGetFD(),packet,len,0,&dest,sizeof(dest)) < 0) return (errno); - ZParseNotice(packet,len,¬ice,0,0); - if (notice.z_kind == UNSAFE || notice.z_kind == HMACK || notice.z_kind == SERVACK || notice.z_kind == CLIENTACK || __Zephyr_server || __HM_set) @@ -51,7 +54,8 @@ Code_t ZSendPacket(packet,len) tv.tv_usec = 500000; for (i=0;i<HM_TIMEOUT*2;i++) { - select(0,&t1,&t2,&t3,&tv); + if (select(0,&t1,&t2,&t3,&tv) < 0) + return (errno); retval = ZCheckIfNotice(ackpack,sizeof ackpack,¬ice, &auth,ZCompareUIDPred, (char *)¬ice.z_uid); diff --git a/lib/ZSetFD.c b/lib/ZSetFD.c index 3b890b9..1816abd 100644 --- a/lib/ZSetFD.c +++ b/lib/ZSetFD.c @@ -19,7 +19,7 @@ Code_t ZSetFD(fd) int fd; { - ZClosePort(); + (void) ZClosePort(); __Zephyr_fd = fd; __Zephyr_open = 0; |