1 --- LPRng-3.7.4/src/common/sendauth.c.shutdown Sun Feb 25 21:55:50 2001
2 +++ LPRng-3.7.4/src/common/sendauth.c Sun Feb 25 21:56:40 2001
6 /* we turn off IO from the socket */
8 +/* shutdown(*sock,1);*/
9 if( (s = safestrchr(buffer,'\n')) ) *s = 0;
10 SNPRINTF( error, errlen)
11 "error '%s' sending '%s' to %s@%s\n",
13 DEBUG2("Pgp_send: sent file" );
14 close(tempfd); tempfd = -1;
15 /* we close the writing side */
16 - shutdown( *sock, 1 );
17 +/* shutdown( *sock, 1 );*/
18 if( (tempfd = Checkwrite(pgpfile,&statb,O_WRONLY|O_TRUNC,1,0)) < 0){
19 SNPRINTF(error,errlen)
20 "Pgp_send: open '%s' for write failed - %s", pgpfile, Errormsg(errno));
21 --- LPRng-3.8.0/src/common/lpstat.c~ Tue Oct 23 15:17:35 2001
22 +++ LPRng-3.8.0/src/common/lpstat.c Tue Oct 23 15:23:46 2001
24 fd = Send_request( 'Q', Displayformat,
25 0, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
27 - /* shutdown( fd, 1 ); */
28 Read_status_info( RemoteHost_DYN, fd,
29 1, Send_query_rw_timeout_DYN, display_format,
31 --- LPRng-3.7.4/src/common/lpc.c.shutdown Sun Feb 25 21:59:14 2001
32 +++ LPRng-3.7.4/src/common/lpc.c Sun Feb 25 21:59:33 2001
34 fd = Send_request( 'C', REQ_CONTROL, l.list, Connect_timeout_DYN,
35 Send_query_rw_timeout_DYN, 1 );
38 +/* shutdown( fd, 1 );*/
39 while( (n = read(fd, msg, sizeof(msg))) > 0 ){
40 if( (write(1,msg,n)) < 0 ) cleanup(0);
42 --- LPRng-3.7.4/src/common/lpr.c.shutdown Sun Feb 25 21:59:46 2001
43 +++ LPRng-3.7.4/src/common/lpr.c Sun Feb 25 22:00:00 2001
45 DEBUG1("lpr: after shutdown fd %d, status_fd %d", fd, status_fd );
47 /* we shut down this connection as well */
48 - shutdown(status_fd,1);
49 +/* shutdown(status_fd,1);*/
50 /* we wait for eof on status_fd */
52 Get_status_from_OF(&prjob,"LP",pid,
53 --- LPRng-3.8.0/src/common/lpq.c~ Tue Oct 23 15:17:35 2001
54 +++ LPRng-3.8.0/src/common/lpq.c Tue Oct 23 15:24:52 2001
56 &argv[Optind], Connect_timeout_DYN,
57 Send_query_rw_timeout_DYN, 1 );
59 - /* shutdown( fd, 1 ); */
60 if( Read_status_info( RemoteHost_DYN, fd,
61 1, Send_query_rw_timeout_DYN, Displayformat,
62 Status_line_count ) ){
63 --- LPRng-3.8.0/src/common/linelist.c~ Tue Oct 23 15:17:36 2001
64 +++ LPRng-3.8.0/src/common/linelist.c Tue Oct 23 15:21:04 2001
66 if( fd < 0 || fstat( fd, &statb ) == -1 ){
68 } else if( Backwards_compatible_DYN || !Half_close_DYN
69 - || !(S_ISSOCK(statb.st_mode)) || shutdown( fd, 1 ) == -1 ){
70 + || !S_ISSOCK(statb.st_mode)){
74 --- LPRng-3.7.4/src/common/lprm.c.shutdown Sun Feb 25 22:02:05 2001
75 +++ LPRng-3.7.4/src/common/lprm.c Sun Feb 25 22:02:16 2001
77 fd = Send_request( 'M', REQ_REMOVE,
78 argv, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
81 +/* shutdown( fd, 1 );*/
82 while( (n = read(fd, msg, sizeof(msg)) ) > 0 ){
83 if( write(1,msg,n) < 0 ) cleanup(0);
85 --- LPRng-3.7.4/src/common/krb5_auth.c.shutdown Sun Feb 25 22:02:36 2001
86 +++ LPRng-3.7.4/src/common/krb5_auth.c Sun Feb 25 22:03:27 2001
90 DEBUG1( "client_krb5_auth: file copy finished %s", file );
91 - if( shutdown(sock, 1) == -1 ){
92 +/* if( shutdown(sock, 1) == -1 ){
93 SNPRINTF( err, errlen) "%s client_krb5_auth failed - "
94 "shutdown failed '%s'",
95 Is_server?"on server":"on client",
101 fd = Checkwrite( file, &statb, O_WRONLY|O_TRUNC, 1, 0 );
103 SNPRINTF( err, errlen)
104 @@ -1146,7 +1146,7 @@
106 SETSTATUS(job) "Printer %s@%s does not support krb4 authentication",
107 RemotePrinter_DYN, host);
109 +/* shutdown(*sock,1);*/
112 memset(&ticket,0,sizeof(ticket));
113 @@ -1158,7 +1158,7 @@
114 if( status != KSUCCESS ){
115 SNPRINTF(errmsg, errlen) "krb4 authentication failed to %s@%s - %s",
116 RemotePrinter_DYN, host, krb4_err_str(status));
118 +/* shutdown(*sock,1);*/
122 @@ -1171,7 +1171,7 @@
124 SNPRINTF(errmsg, errlen) "cannot read status from %s@%s - %s",
125 RemotePrinter_DYN, host );
127 +/* shutdown(*sock,1);*/
130 SETSTATUS(job)"krb4 authentication succeeded to %s@%s",
131 --- LPRng-3.8.0/src/common/lpd_status.c~ Tue Oct 23 15:17:36 2001
132 +++ LPRng-3.8.0/src/common/lpd_status.c Tue Oct 23 15:22:46 2001
133 @@ -1216,7 +1216,6 @@
134 Send_query_rw_timeout_DYN, *sock );
137 - /* shutdown( fd, 1 ); */
138 tempfd = Make_temp_fd( &tempfile );
139 while( (nx = read(fd,msg,sizeof(msg))) > 0 ){
140 if( Write_fd_len(tempfd,msg,nx) < 0 ) cleanup(0);
141 @@ -1387,7 +1386,6 @@
142 fd = Send_request( 'Q', displayformat, tokens->list, Connect_timeout_DYN,
143 Send_query_rw_timeout_DYN, *sock );
145 - /* shutdown( fd, 1 ); */
146 tempfd = Make_temp_fd( 0 );
147 while( (n = read(fd,msg,sizeof(msg))) > 0 ){
148 if( Write_fd_len(tempfd,msg,n) < 0 ) cleanup(0);
149 --- LPRng-3.7.4/src/common/lpd_remove.c.shutdown Sun Feb 25 22:04:27 2001
150 +++ LPRng-3.7.4/src/common/lpd_remove.c Sun Feb 25 22:04:49 2001
152 fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
153 Send_query_rw_timeout_DYN, *sock );
156 +/* shutdown( fd, 1 );*/
157 while( (c = read(fd,msg,sizeof(msg))) > 0 ){
158 Write_fd_len(*sock,msg,c);
161 fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
162 Send_query_rw_timeout_DYN, *sock );
165 +/* shutdown( fd, 1 );*/
166 while( (n = read(fd,msg,sizeof(msg))) > 0 ){
167 Write_fd_len(*sock,msg,n);
169 --- LPRng-3.7.4/src/common/user_auth.stub.shutdown Sun Feb 25 22:05:08 2001
170 +++ LPRng-3.7.4/src/common/user_auth.stub Sun Feb 25 22:05:47 2001
173 close(tempfd); tempfd = -1;
174 /* we close the writing side */
175 - shutdown( *sock, 1 );
176 +/* shutdown( *sock, 1 );*/
178 DEBUG1("Test_send: sent file" );
183 if( errmsg[0] && *sock ){
185 +/* shutdown(*sock,1);*/
188 DEBUG1("md5_connect: error '%s'", errmsg );
189 @@ -1193,7 +1193,7 @@
191 close(tempfd); tempfd = -1;
192 /* we close the writing side */
193 - shutdown( *sock, 1 );
194 +/* shutdown( *sock, 1 );*/
196 DEBUG1("md5_send: sent file" );
198 --- LPRng-3.8.0/src/common/accounting.c~ Tue Oct 23 15:17:36 2001
199 +++ LPRng-3.8.0/src/common/accounting.c Tue Oct 23 15:18:45 2001
202 LOGERR_DIE(LOG_INFO)"Do_accounting: write to '%s' failed", command);
204 - shutdown(tempfd,1);
206 tempfd = Checkwrite( Accounting_file_DYN, &statb, 0, Create_files_DYN, 0 );
207 DEBUG2("Setup_accounting: fd %d", tempfd );