000-debian_16.patch 7.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270
  1. --- a/src/arpd/io.c
  2. +++ b/src/arpd/io.c
  3. @@ -277,7 +277,8 @@ static void accept_new(void)
  4. struct atm_qos qos;
  5. ENTRY *entry;
  6. VCC *vcc;
  7. - int fd,len,size,error;
  8. + int fd,error;
  9. + socklen_t len,size;
  10. len = sizeof(addr);
  11. if ((fd = accept(incoming,(struct sockaddr *) &addr,&len)) < 0) {
  12. @@ -614,7 +615,8 @@ int ip_itf_info(int number,uint32_t *ip,
  13. int get_local(int fd,struct sockaddr_atmsvc *addr)
  14. {
  15. - int length,result;
  16. + int result;
  17. + size_t length;
  18. length = sizeof(struct sockaddr_atmsvc);
  19. result = getsockname(fd,(struct sockaddr *) addr,&length);
  20. --- a/src/arpd/table.c
  21. +++ b/src/arpd/table.c
  22. @@ -101,7 +101,8 @@ static void dump_vcc(VCC *vcc)
  23. char addr_buf[MAX_ATM_ADDR_LEN+1];
  24. char qos_buf[MAX_ATM_QOS_LEN+1];
  25. struct atm_qos qos;
  26. - int size,sndbuf;
  27. + int sndbuf;
  28. + socklen_t size;
  29. size = sizeof(addr);
  30. if (getpeername(vcc->fd,(struct sockaddr *) &addr,&size) < 0) {
  31. --- a/src/ilmid/asn1/asn_int.c
  32. +++ b/src/ilmid/asn1/asn_int.c
  33. @@ -185,7 +185,7 @@ FILE* f _AND_
  34. AsnInt* v _AND_
  35. unsigned short int indent)
  36. {
  37. - fprintf(f,"%d", *v);
  38. + fprintf(f,"%ld", *v);
  39. }
  40. @@ -370,5 +370,5 @@ FILE* f _AND_
  41. UAsnInt* v _AND_
  42. unsigned short int indent)
  43. {
  44. - fprintf(f,"%u", *v);
  45. + fprintf(f,"%lu", *v);
  46. }
  47. --- a/src/ilmid/asn1/asn_oid.c
  48. +++ b/src/ilmid/asn1/asn_oid.c
  49. @@ -127,7 +127,7 @@ unsigned short int indent)
  50. if (firstArcNum > 2)
  51. firstArcNum = 2;
  52. - fprintf(f,"%u %u", firstArcNum, arcNum - (firstArcNum * 40));
  53. + fprintf(f,"%d %lu", firstArcNum, arcNum - (firstArcNum * 40));
  54. for (; i < v->octetLen ; )
  55. {
  56. @@ -136,7 +136,7 @@ unsigned short int indent)
  57. arcNum = (arcNum << 7) + (v->octs[i] & 0x7f);
  58. i++;
  59. - fprintf(f," %u", arcNum);
  60. + fprintf(f," %lu", arcNum);
  61. }
  62. fprintf(f,"}");
  63. --- a/src/lane/connect.c
  64. +++ b/src/lane/connect.c
  65. @@ -258,7 +258,8 @@ static int
  66. data_handler(const Event_t *event, void *funcdata)
  67. {
  68. Conn_t *tmp, *newconn;
  69. - int fd, nbytes;
  70. + int fd;
  71. + socklen_t nbytes;
  72. static char buffer[BUFSIZE];
  73. LaneControl_t *ctmp;
  74. struct sockaddr_atmsvc addr;
  75. --- a/src/lane/connect_bus.c
  76. +++ b/src/lane/connect_bus.c
  77. @@ -170,7 +170,8 @@ static int
  78. data_handler(const Event_t *event, void *funcdata)
  79. {
  80. Conn_t *tmp, *newconn;
  81. - int fd, nbytes;
  82. + int fd;
  83. + socklen_t nbytes;
  84. static char buffer[BUFSIZE];
  85. struct sockaddr_atmsvc addr;
  86. --- a/src/lane/lane_atm.c
  87. +++ b/src/lane/lane_atm.c
  88. @@ -138,7 +138,7 @@ atm_connect_back(const AtmAddr_t *our_ad
  89. struct atm_blli blli;
  90. struct atm_qos qos;
  91. int fd, ret;
  92. - int len = sizeof(address);
  93. + socklen_t len = sizeof(address);
  94. fd = socket(PF_ATMSVC, SOCK_DGRAM, 0);
  95. if (fd <0) {
  96. --- a/src/lane/lecs.c
  97. +++ b/src/lane/lecs.c
  98. @@ -119,7 +119,7 @@ int main(int argc, char **argv)
  99. int just_dump=0;
  100. fd_set fds;
  101. struct sockaddr_atmsvc client;
  102. - int len;
  103. + socklen_t len;
  104. unsigned char buffer[P_SIZE];
  105. while(i!=-1) {
  106. --- a/src/lib/ans.c
  107. +++ b/src/lib/ans.c
  108. @@ -41,7 +41,7 @@
  109. static int ans(const char *text,int wanted,void *result,int res_len)
  110. {
  111. unsigned char answer[MAX_ANSWER];
  112. - unsigned char name[MAX_NAME];
  113. + char name[MAX_NAME];
  114. unsigned char *pos,*data,*found;
  115. int answer_len,name_len,data_len,found_len;
  116. int questions,answers;
  117. --- a/src/lib/sdu2cell.c
  118. +++ b/src/lib/sdu2cell.c
  119. @@ -15,7 +15,8 @@ int sdu2cell(int s,int sizes,const int *
  120. {
  121. struct atm_qos qos;
  122. int trailer,total,cells;
  123. - int size,i;
  124. + int i;
  125. + socklen_t size;
  126. size = sizeof(qos);
  127. if (getsockopt(s,SOL_AAL,SO_ATMQOS,&qos,&size) < 0) return -1;
  128. --- a/src/lib/unix.c
  129. +++ b/src/lib/unix.c
  130. @@ -63,8 +63,8 @@ int un_attach(const char *path)
  131. int un_recv_connect(int s,void *buf,int size)
  132. {
  133. struct sockaddr_un addr;
  134. - int addr_size;
  135. int len;
  136. + socklen_t addr_size;
  137. addr_size = sizeof(addr);
  138. len = recvfrom(s,buf,size,0,(struct sockaddr *) &addr,&addr_size);
  139. --- a/src/maint/atmtcp.c
  140. +++ b/src/maint/atmtcp.c
  141. @@ -817,7 +817,8 @@ int main(int argc,char **argv)
  142. }
  143. else if (!strcmp(ARG,"listen") ||
  144. (do_background = !strcmp(ARG,"listen-bg"))) {
  145. - int fd,port,addr_len;
  146. + int fd,port;
  147. + socklen_t addr_len;
  148. int *fd2 = alloc_t(int);
  149. if ((fd = socket(PF_INET,SOCK_STREAM,0)) < 0) {
  150. --- a/src/maint/hediag.c
  151. +++ b/src/maint/hediag.c
  152. @@ -1,6 +1,7 @@
  153. #include <stdio.h>
  154. #include <stdlib.h>
  155. #include <unistd.h>
  156. +#include <string.h>
  157. #include <sys/ioctl.h>
  158. #include <sys/types.h>
  159. #include <sys/socket.h>
  160. --- a/src/mpoad/io.c
  161. +++ b/src/mpoad/io.c
  162. @@ -521,7 +521,8 @@ static int msg_from_mps(int slot)
  163. static int accept_conn(int slot)
  164. {
  165. struct sockaddr_atmsvc sa;
  166. - int i, new_fd, sa_len;
  167. + int i, new_fd;
  168. + socklen_t sa_len;
  169. sa_len = sizeof(sa);
  170. new_fd = accept(fds[slot].fd, (struct sockaddr *)&sa, &sa_len);
  171. --- a/src/sigd/io.c
  172. +++ b/src/sigd/io.c
  173. @@ -355,7 +355,7 @@ int get_pvc(int itf,int *vci)
  174. error = 0;
  175. if (bind(s,(struct sockaddr *) &addr,sizeof(addr)) < 0) error = errno;
  176. else {
  177. - int size;
  178. + socklen_t size;
  179. size = sizeof(addr);
  180. if (getsockname(s,(struct sockaddr *) &addr,&size) < 0)
  181. --- a/src/test/ttcp.c
  182. +++ b/src/test/ttcp.c
  183. @@ -92,7 +92,8 @@ struct sockaddr_in frominet;
  184. struct sockaddr_atmsvc satm;
  185. struct atm_qos qos;
  186. -int domain, fromlen;
  187. +int domain;
  188. +socklen_t fromlen;
  189. int fd; /* fd of network socket */
  190. int buflen = 8 * 1024; /* length of buffer */
  191. @@ -466,7 +467,7 @@ int no_check = 0;
  192. {
  193. struct sockaddr_atmsvc peer;
  194. - int peerlen = sizeof(peer);
  195. + socklen_t peerlen = sizeof(peer);
  196. if (getpeername(fd, (struct sockaddr *) &peer,
  197. &peerlen) < 0) {
  198. err("getpeername");
  199. @@ -498,7 +499,7 @@ int no_check = 0;
  200. /* set socket buffer size */
  201. #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
  202. if (sockbufsize) {
  203. - int len;
  204. + socklen_t len;
  205. if (trans) {
  206. /* set send socket buffer if we are transmitting */
  207. --- a/src/mpoad/mpcd.8
  208. +++ b/src/mpoad/mpcd.8
  209. @@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A
  210. .B ]]
  211. .SH DESCRIPTION
  212. MPOA client
  213. -.SM(MPC) is responsible for creating and receiving
  214. +.SM (MPC) is responsible for creating and receiving
  215. internetwork layer shortcuts. Using these shortcuts MPCs forward
  216. unicast internetwork layer packets effectively over ATM without need
  217. for routing protocols.
  218. @@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o
  219. shortcuts is done with the help of
  220. .SM MPOA
  221. server
  222. -.SM(MPS).
  223. +.SM (MPS).
  224. .PP
  225. Just as the Linux
  226. .SM LAN
  227. --- a/src/led/zeppelin.8
  228. +++ b/src/led/zeppelin.8
  229. @@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using
  230. recommended. Token Ring support has received less testing than its
  231. Ethernet counterpart.
  232. .SH FILES
  233. -.IP \fI/var/run/lec[interface number].pid\fP
  234. +.IP \fI/var/run/lec[interface\ number].pid\fP
  235. The file containing the process id of zeppelin.
  236. .SH BUGS
  237. John Bonham died 1980 and Led Zeppelin broke.
  238. --- a/src/sigd/atmsigd.conf.4
  239. +++ b/src/sigd/atmsigd.conf.4
  240. @@ -125,7 +125,7 @@ a comment. The `#' character cannot be e
  241. .P
  242. If an option is specified in \fBatmsigd.conf\fP and on the command
  243. line, the command line has priority.
  244. -.COMPATIBILITY
  245. +.SH COMPATIBILITY
  246. Certain options used by past versions of \fBatmsigd\fP but no longer documented
  247. on the man page are still recognized and supported, but they also yield a
  248. warning message. Future versions of \fBatmsigd\fP will not recognize those