1 --- LPRng-3.7.4/src/common/sendjob.c.shutdown Sun Feb 25 21:54:07 2001
2 +++ LPRng-3.7.4/src/common/sendjob.c Sun Feb 25 21:55:40 2001
7 - if( sock >= 0 ) shutdown(sock,1);
8 +/* if( sock >= 0 ) shutdown(sock,1); */
10 if( (s = Find_str_value(&job->info,ERROR,Value_sep )) ){
11 SETSTATUS(logjob) "job '%s' transfer to %s@%s failed\n %s",
13 status = Link_copy( RemoteHost_DYN, sock, 0, transfer_timeout,
22 || ( fd !=0 && (status = Link_send( RemoteHost_DYN,sock,
23 transfer_timeout,"",1,&ack )) ) ){
24 --- LPRng-3.7.4/src/common/sendauth.c.shutdown Sun Feb 25 21:55:50 2001
25 +++ LPRng-3.7.4/src/common/sendauth.c Sun Feb 25 21:56:40 2001
29 /* we turn off IO from the socket */
31 +/* shutdown(*sock,1);*/
32 if( (s = safestrchr(buffer,'\n')) ) *s = 0;
33 SNPRINTF( error, errlen)
34 "error '%s' sending '%s' to %s@%s\n",
36 DEBUG2("Pgp_send: sent file" );
37 close(tempfd); tempfd = -1;
38 /* we close the writing side */
39 - shutdown( *sock, 1 );
40 +/* shutdown( *sock, 1 );*/
41 if( (tempfd = Checkwrite(pgpfile,&statb,O_WRONLY|O_TRUNC,1,0)) < 0){
42 SNPRINTF(error,errlen)
43 "Pgp_send: open '%s' for write failed - %s", pgpfile, Errormsg(errno));
44 --- LPRng-3.7.4/src/common/lpstat.c.shutdown Sun Feb 25 21:57:03 2001
45 +++ LPRng-3.7.4/src/common/lpstat.c Sun Feb 25 21:57:19 2001
47 fd = Send_request( 'Q', Displayformat,
48 0, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
51 +/* shutdown( fd, 1 );*/
52 Read_status_info( RemoteHost_DYN, fd,
53 1, Send_query_rw_timeout_DYN, display_format,
55 --- LPRng-3.7.4/src/common/lpc.c.shutdown Sun Feb 25 21:59:14 2001
56 +++ LPRng-3.7.4/src/common/lpc.c Sun Feb 25 21:59:33 2001
58 fd = Send_request( 'C', REQ_CONTROL, l.list, Connect_timeout_DYN,
59 Send_query_rw_timeout_DYN, 1 );
62 +/* shutdown( fd, 1 );*/
63 while( (n = read(fd, msg, sizeof(msg))) > 0 ){
64 if( (write(1,msg,n)) < 0 ) cleanup(0);
66 --- LPRng-3.7.4/src/common/lpr.c.shutdown Sun Feb 25 21:59:46 2001
67 +++ LPRng-3.7.4/src/common/lpr.c Sun Feb 25 22:00:00 2001
69 DEBUG1("lpr: after shutdown fd %d, status_fd %d", fd, status_fd );
71 /* we shut down this connection as well */
72 - shutdown(status_fd,1);
73 +/* shutdown(status_fd,1);*/
74 /* we wait for eof on status_fd */
76 Get_status_from_OF(&prjob,"LP",pid,
77 --- LPRng-3.7.4/src/common/lpq.c.shutdown Sun Feb 25 22:00:21 2001
78 +++ LPRng-3.7.4/src/common/lpq.c Sun Feb 25 22:00:35 2001
80 &argv[Optind], Connect_timeout_DYN,
81 Send_query_rw_timeout_DYN, 1 );
84 +/* shutdown( fd, 1 );*/
85 if( Read_status_info( RemoteHost_DYN, fd,
86 1, Send_query_rw_timeout_DYN, Displayformat,
87 Status_line_count ) ){
88 --- LPRng-3.7.4/src/common/linelist.c.shutdown Sun Feb 25 22:00:55 2001
89 +++ LPRng-3.7.4/src/common/linelist.c Sun Feb 25 22:01:53 2001
92 if( fd < 0 || fstat( fd, &statb ) == -1 ){
94 - } else if( !(S_ISSOCK(statb.st_mode)) || shutdown( fd, 1 ) == -1 ){
95 + } else if( !(S_ISSOCK(statb.st_mode))/* || shutdown( fd, 1 ) == -1*/ ){
99 --- LPRng-3.7.4/src/common/lprm.c.shutdown Sun Feb 25 22:02:05 2001
100 +++ LPRng-3.7.4/src/common/lprm.c Sun Feb 25 22:02:16 2001
102 fd = Send_request( 'M', REQ_REMOVE,
103 argv, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
106 +/* shutdown( fd, 1 );*/
107 while( (n = read(fd, msg, sizeof(msg)) ) > 0 ){
108 if( write(1,msg,n) < 0 ) cleanup(0);
110 --- LPRng-3.7.4/src/common/krb5_auth.c.shutdown Sun Feb 25 22:02:36 2001
111 +++ LPRng-3.7.4/src/common/krb5_auth.c Sun Feb 25 22:03:27 2001
112 @@ -698,14 +698,14 @@
115 DEBUG1( "client_krb5_auth: file copy finished %s", file );
116 - if( shutdown(sock, 1) == -1 ){
117 +/* if( shutdown(sock, 1) == -1 ){
118 SNPRINTF( err, errlen) "%s client_krb5_auth failed - "
119 "shutdown failed '%s'",
120 Is_server?"on server":"on client",
126 fd = Checkwrite( file, &statb, O_WRONLY|O_TRUNC, 1, 0 );
128 SNPRINTF( err, errlen)
129 @@ -1146,7 +1146,7 @@
131 SETSTATUS(job) "Printer %s@%s does not support krb4 authentication",
132 RemotePrinter_DYN, host);
134 +/* shutdown(*sock,1);*/
137 memset(&ticket,0,sizeof(ticket));
138 @@ -1158,7 +1158,7 @@
139 if( status != KSUCCESS ){
140 SNPRINTF(errmsg, errlen) "krb4 authentication failed to %s@%s - %s",
141 RemotePrinter_DYN, host, krb4_err_str(status));
143 +/* shutdown(*sock,1);*/
147 @@ -1171,7 +1171,7 @@
149 SNPRINTF(errmsg, errlen) "cannot read status from %s@%s - %s",
150 RemotePrinter_DYN, host );
152 +/* shutdown(*sock,1);*/
155 SETSTATUS(job)"krb4 authentication succeeded to %s@%s",
156 --- LPRng-3.7.4/src/common/lpd_status.c.shutdown Sun Feb 25 22:03:47 2001
157 +++ LPRng-3.7.4/src/common/lpd_status.c Sun Feb 25 22:04:13 2001
158 @@ -1169,7 +1169,7 @@
159 Send_query_rw_timeout_DYN, *sock );
163 +/* shutdown( fd, 1 );*/
164 tempfd = Make_temp_fd( &tempfile );
165 while( (nx = read(fd,msg,sizeof(msg))) > 0 ){
166 if( Write_fd_len(tempfd,msg,nx) < 0 ) cleanup(0);
167 @@ -1341,7 +1341,7 @@
168 fd = Send_request( 'Q', displayformat, tokens->list, Connect_timeout_DYN,
169 Send_query_rw_timeout_DYN, *sock );
172 +/* shutdown( fd, 1 );*/
173 tempfd = Make_temp_fd( 0 );
174 while( (n = read(fd,msg,sizeof(msg))) > 0 ){
175 if( Write_fd_len(tempfd,msg,n) < 0 ) cleanup(0);
176 --- LPRng-3.7.4/src/common/lpd_remove.c.shutdown Sun Feb 25 22:04:27 2001
177 +++ LPRng-3.7.4/src/common/lpd_remove.c Sun Feb 25 22:04:49 2001
179 fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
180 Send_query_rw_timeout_DYN, *sock );
183 +/* shutdown( fd, 1 );*/
184 while( (c = read(fd,msg,sizeof(msg))) > 0 ){
185 Write_fd_len(*sock,msg,c);
188 fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
189 Send_query_rw_timeout_DYN, *sock );
192 +/* shutdown( fd, 1 );*/
193 while( (n = read(fd,msg,sizeof(msg))) > 0 ){
194 Write_fd_len(*sock,msg,n);
196 --- LPRng-3.7.4/src/common/user_auth.stub.shutdown Sun Feb 25 22:05:08 2001
197 +++ LPRng-3.7.4/src/common/user_auth.stub Sun Feb 25 22:05:47 2001
200 close(tempfd); tempfd = -1;
201 /* we close the writing side */
202 - shutdown( *sock, 1 );
203 +/* shutdown( *sock, 1 );*/
205 DEBUG1("Test_send: sent file" );
210 if( errmsg[0] && *sock ){
212 +/* shutdown(*sock,1);*/
215 DEBUG1("md5_connect: error '%s'", errmsg );
216 @@ -1193,7 +1193,7 @@
218 close(tempfd); tempfd = -1;
219 /* we close the writing side */
220 - shutdown( *sock, 1 );
221 +/* shutdown( *sock, 1 );*/
223 DEBUG1("md5_send: sent file" );
225 --- LPRng-3.7.4/src/common/accounting.c.shutdown Sun Feb 25 22:05:57 2001
226 +++ LPRng-3.7.4/src/common/accounting.c Sun Feb 25 22:06:21 2001
229 LOGERR(LOG_INFO)"Do_accounting: write to %s failed", command);
231 - shutdown(tempfd,1);
232 +/* shutdown(tempfd,1);*/
234 tempfd = Checkwrite( Accounting_file_DYN, &statb, 0, Create_files_DYN, 0 );
235 DEBUG2("Setup_accounting: fd %d", tempfd );