[packages/LPRng.git] / LPRng-shutdown.patch

--- LPRng-3.7.4/src/common/sendjob.c.shutdown	Sun Feb 25 21:54:07 2001
+++ LPRng-3.7.4/src/common/sendjob.c	Sun Feb 25 21:55:40 2001
@@ -195,7 +195,7 @@
 
  error:
 
-	if( sock >= 0 ) shutdown(sock,1);
+/*	if( sock >= 0 ) shutdown(sock,1); */
 	if( status ){
 		if( (s = Find_str_value(&job->info,ERROR,Value_sep )) ){
 			SETSTATUS(logjob) "job '%s' transfer to %s@%s failed\n  %s",
@@ -508,9 +508,9 @@
 				status = Link_copy( RemoteHost_DYN, sock, 0, transfer_timeout,
 						openname, fd, size );
 			}
-			if( fd == 0 ){
+/*			if( fd == 0 ){
 				shutdown(*sock,1);
-			}
+			}*/
 			if( status 
 				|| ( fd !=0 && (status = Link_send( RemoteHost_DYN,sock,
 					transfer_timeout,"",1,&ack )) ) ){
--- LPRng-3.7.4/src/common/sendauth.c.shutdown	Sun Feb 25 21:55:50 2001
+++ LPRng-3.7.4/src/common/sendauth.c	Sun Feb 25 21:56:40 2001
@@ -157,7 +157,7 @@
 				tempfile);
 		}
 		/* we turn off IO from the socket */
-		shutdown(*sock,1);
+/*		shutdown(*sock,1);*/
 		if( (s = safestrchr(buffer,'\n')) ) *s = 0;
 		SNPRINTF( error, errlen)
 			"error '%s' sending '%s' to %s@%s\n",
@@ -345,7 +345,7 @@
 	DEBUG2("Pgp_send: sent file" );
 	close(tempfd); tempfd = -1;
 	/* we close the writing side */
-	shutdown( *sock, 1 );
+/*	shutdown( *sock, 1 );*/
 	if( (tempfd = Checkwrite(pgpfile,&statb,O_WRONLY|O_TRUNC,1,0)) < 0){
 		SNPRINTF(error,errlen)
 			"Pgp_send: open '%s' for write failed - %s", pgpfile, Errormsg(errno));
--- LPRng-3.7.4/src/common/lpstat.c.shutdown	Sun Feb 25 21:57:03 2001
+++ LPRng-3.7.4/src/common/lpstat.c	Sun Feb 25 21:57:19 2001
@@ -243,7 +243,7 @@
 	fd = Send_request( 'Q', Displayformat,
 		0, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
 	if( fd >= 0 ){
-		shutdown( fd, 1 );
+/*		shutdown( fd, 1 );*/
 		Read_status_info( RemoteHost_DYN, fd,
 			1, Send_query_rw_timeout_DYN, display_format,
 			Status_line_count );
--- LPRng-3.7.4/src/common/lpc.c.shutdown	Sun Feb 25 21:59:14 2001
+++ LPRng-3.7.4/src/common/lpc.c	Sun Feb 25 21:59:33 2001
@@ -364,7 +364,7 @@
 		fd = Send_request( 'C', REQ_CONTROL, l.list, Connect_timeout_DYN,
 			Send_query_rw_timeout_DYN, 1 );
 		if( fd > 0 ){
-			shutdown( fd, 1 );
+/*			shutdown( fd, 1 );*/
 			while( (n = read(fd, msg, sizeof(msg))) > 0 ){
 				if( (write(1,msg,n)) < 0 ) cleanup(0);
 			}
--- LPRng-3.7.4/src/common/lpr.c.shutdown	Sun Feb 25 21:59:46 2001
+++ LPRng-3.7.4/src/common/lpr.c	Sun Feb 25 22:00:00 2001
@@ -222,7 +222,7 @@
 		DEBUG1("lpr: after shutdown fd %d, status_fd %d", fd, status_fd );
 		if( status_fd > 0 ){
 			/* we shut down this connection as well */
-			shutdown(status_fd,1);
+/*			shutdown(status_fd,1);*/
 			/* we wait for eof on status_fd */
 			buffer[0] = 0;
 			Get_status_from_OF(&prjob,"LP",pid,
--- LPRng-3.7.4/src/common/lpq.c.shutdown	Sun Feb 25 22:00:21 2001
+++ LPRng-3.7.4/src/common/lpq.c	Sun Feb 25 22:00:35 2001
@@ -231,7 +231,7 @@
 		&argv[Optind], Connect_timeout_DYN,
 		Send_query_rw_timeout_DYN, 1 );
 	if( fd >= 0 ){
-		shutdown( fd, 1 );
+/*		shutdown( fd, 1 );*/
 		if( Read_status_info( RemoteHost_DYN, fd,
 			1, Send_query_rw_timeout_DYN, Displayformat,
 			Status_line_count ) ){
--- LPRng-3.7.4/src/common/linelist.c.shutdown	Sun Feb 25 22:00:55 2001
+++ LPRng-3.7.4/src/common/linelist.c	Sun Feb 25 22:01:53 2001
@@ -3612,7 +3612,7 @@
 
 	if( fd < 0 || fstat( fd, &statb ) == -1 ){
 		fd = -1;
-	} else if( !(S_ISSOCK(statb.st_mode)) || shutdown( fd, 1 ) == -1 ){
+	} else if( !(S_ISSOCK(statb.st_mode))/* || shutdown( fd, 1 ) == -1*/ ){
 		close(fd);
 		fd = -1;
 	}
--- LPRng-3.7.4/src/common/lprm.c.shutdown	Sun Feb 25 22:02:05 2001
+++ LPRng-3.7.4/src/common/lprm.c	Sun Feb 25 22:02:16 2001
@@ -244,7 +244,7 @@
 	fd = Send_request( 'M', REQ_REMOVE,
 		argv, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
 	if( fd > 0 ){
-		shutdown( fd, 1 );
+/*		shutdown( fd, 1 );*/
 		while( (n = read(fd, msg, sizeof(msg)) ) > 0 ){
 			if( write(1,msg,n) < 0 ) cleanup(0);
 		}
--- LPRng-3.7.4/src/common/krb5_auth.c.shutdown	Sun Feb 25 22:02:36 2001
+++ LPRng-3.7.4/src/common/krb5_auth.c	Sun Feb 25 22:03:27 2001
@@ -698,14 +698,14 @@
 	close(fd);
 	fd = -1;
 	DEBUG1( "client_krb5_auth: file copy finished %s", file );
-	if( shutdown(sock, 1) == -1 ){
+/*	if( shutdown(sock, 1) == -1 ){
 		SNPRINTF( err, errlen) "%s client_krb5_auth failed - "
 			"shutdown failed '%s'",
 			Is_server?"on server":"on client",
 			Errormsg(errno) );
 		retval = 1;
 		goto done;
-	}
+	}*/
 	fd = Checkwrite( file, &statb, O_WRONLY|O_TRUNC, 1, 0 );
 	if( fd < 0 ){
 		SNPRINTF( err, errlen)
@@ -1146,7 +1146,7 @@
 	if( status ){
 		SETSTATUS(job) "Printer %s@%s does not support krb4 authentication",
 			RemotePrinter_DYN, host);
-		shutdown(*sock,1);
+/*		shutdown(*sock,1);*/
 		return JFAIL;
 	}
 	memset(&ticket,0,sizeof(ticket));
@@ -1158,7 +1158,7 @@
 	if( status != KSUCCESS ){
 		SNPRINTF(errmsg, errlen) "krb4 authentication failed to %s@%s - %s",
 			RemotePrinter_DYN, host, krb4_err_str(status));
-		shutdown(*sock,1);
+/*		shutdown(*sock,1);*/
 		return JFAIL;
 	}
 	buffer[0] = 0;
@@ -1171,7 +1171,7 @@
 	if(status){
 		SNPRINTF(errmsg, errlen) "cannot read status from %s@%s - %s",
 			RemotePrinter_DYN, host );
-		shutdown(*sock,1);
+/*		shutdown(*sock,1);*/
 		return JFAIL;
 	} else {
 		SETSTATUS(job)"krb4 authentication succeeded to %s@%s",
--- LPRng-3.7.4/src/common/lpd_status.c.shutdown	Sun Feb 25 22:03:47 2001
+++ LPRng-3.7.4/src/common/lpd_status.c	Sun Feb 25 22:04:13 2001
@@ -1169,7 +1169,7 @@
 					Send_query_rw_timeout_DYN, *sock );
 				if( fd >= 0 ){
 					char *tempfile;
-					shutdown( fd, 1 );
+/*					shutdown( fd, 1 );*/
 					tempfd = Make_temp_fd( &tempfile );
 					while( (nx = read(fd,msg,sizeof(msg))) > 0 ){
 						if( Write_fd_len(tempfd,msg,nx) < 0 ) cleanup(0);
@@ -1341,7 +1341,7 @@
 		fd = Send_request( 'Q', displayformat, tokens->list, Connect_timeout_DYN,
 			Send_query_rw_timeout_DYN, *sock );
 		if( fd >= 0 ){
-			shutdown( fd, 1 );
+/*			shutdown( fd, 1 );*/
 			tempfd = Make_temp_fd( 0 );
 			while( (n = read(fd,msg,sizeof(msg))) > 0 ){
 				if( Write_fd_len(tempfd,msg,n) < 0 ) cleanup(0);
--- LPRng-3.7.4/src/common/lpd_remove.c.shutdown	Sun Feb 25 22:04:27 2001
+++ LPRng-3.7.4/src/common/lpd_remove.c	Sun Feb 25 22:04:49 2001
@@ -352,7 +352,7 @@
 			fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
 				Send_query_rw_timeout_DYN, *sock );
 			if( fd >= 0 ){
-				shutdown( fd, 1 );
+/*				shutdown( fd, 1 );*/
 				while( (c = read(fd,msg,sizeof(msg))) > 0 ){
 					Write_fd_len(*sock,msg,c);
 				}
@@ -414,7 +414,7 @@
 	fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
 		Send_query_rw_timeout_DYN, *sock );
 	if( fd >= 0 ){
-		shutdown( fd, 1 );
+/*		shutdown( fd, 1 );*/
 		while( (n = read(fd,msg,sizeof(msg))) > 0 ){
 			Write_fd_len(*sock,msg,n);
 		}
--- LPRng-3.7.4/src/common/user_auth.stub.shutdown	Sun Feb 25 22:05:08 2001
+++ LPRng-3.7.4/src/common/user_auth.stub	Sun Feb 25 22:05:47 2001
@@ -350,7 +350,7 @@
 	}
 	close(tempfd); tempfd = -1;
 	/* we close the writing side */
-	shutdown( *sock, 1 );
+/*	shutdown( *sock, 1 );*/
 
 	DEBUG1("Test_send: sent file" );
 
@@ -724,7 +724,7 @@
 
   error:
 	if( errmsg[0] && *sock ){
-		shutdown(*sock,1);
+/*		shutdown(*sock,1);*/
 		len = 0;
 		buffer[0] = 0;
 		DEBUG1("md5_connect: error '%s'", errmsg );
@@ -1193,7 +1193,7 @@
 	}
 	close(tempfd); tempfd = -1;
 	/* we close the writing side */
-	shutdown( *sock, 1 );
+/*	shutdown( *sock, 1 );*/
 
 	DEBUG1("md5_send: sent file" );
 
--- LPRng-3.7.4/src/common/accounting.c.shutdown	Sun Feb 25 22:05:57 2001
+++ LPRng-3.7.4/src/common/accounting.c	Sun Feb 25 22:06:21 2001
@@ -78,7 +78,7 @@
 			err = JABORT;
 			LOGERR(LOG_INFO)"Do_accounting: write to %s failed", command);
 		}
-		shutdown(tempfd,1);
+/*		shutdown(tempfd,1);*/
 	} else {
 		tempfd = Checkwrite( Accounting_file_DYN, &statb, 0, Create_files_DYN, 0 );
 		DEBUG2("Setup_accounting: fd %d", tempfd );
Commit	Line	Data
c319577f	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
	3	@@ -195,7 +195,7 @@
	4
	5	error:
	6
	7	- if( sock >= 0 ) shutdown(sock,1);
	8	+/* if( sock >= 0 ) shutdown(sock,1); */
	9	if( status ){
	10	if( (s = Find_str_value(&job->info,ERROR,Value_sep )) ){
	11	SETSTATUS(logjob) "job '%s' transfer to %s@%s failed\n %s",
	12	@@ -508,9 +508,9 @@
	13	status = Link_copy( RemoteHost_DYN, sock, 0, transfer_timeout,
	14	openname, fd, size );
	15	}
	16	- if( fd == 0 ){
	17	+/* if( fd == 0 ){
	18	shutdown(*sock,1);
	19	- }
	20	+ }*/
	21	if( status
	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
	26	@@ -157,7 +157,7 @@
	27	tempfile);
	28	}
	29	/* we turn off IO from the socket */
	30	- shutdown(*sock,1);
	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",
	35	@@ -345,7 +345,7 @@
	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
	46	@@ -243,7 +243,7 @@
	47	fd = Send_request( 'Q', Displayformat,
	48	0, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
	49	if( fd >= 0 ){
	50	- shutdown( fd, 1 );
	51	+/* shutdown( fd, 1 );*/
	52	Read_status_info( RemoteHost_DYN, fd,
	53	1, Send_query_rw_timeout_DYN, display_format,
	54	Status_line_count );
	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
	57	@@ -364,7 +364,7 @@
	58	fd = Send_request( 'C', REQ_CONTROL, l.list, Connect_timeout_DYN,
	59	Send_query_rw_timeout_DYN, 1 );
	60	if( fd > 0 ){
	61	- shutdown( fd, 1 );
	62	+/* shutdown( fd, 1 );*/
	63	while( (n = read(fd, msg, sizeof(msg))) > 0 ){
	64	if( (write(1,msg,n)) < 0 ) cleanup(0);
65	}
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
68	@@ -222,7 +222,7 @@
69	DEBUG1("lpr: after shutdown fd %d, status_fd %d", fd, status_fd );
70	if( status_fd > 0 ){
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 */
75	buffer[0] = 0;
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
79	@@ -231,7 +231,7 @@
80	&argv[Optind], Connect_timeout_DYN,
81	Send_query_rw_timeout_DYN, 1 );
82	if( fd >= 0 ){
83	- shutdown( fd, 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
90	@@ -3612,7 +3612,7 @@
91
92	if( fd < 0 \|\| fstat( fd, &statb ) == -1 ){
93	fd = -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*/ ){
96	close(fd);
97	fd = -1;
98	}
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
101	@@ -244,7 +244,7 @@
102	fd = Send_request( 'M', REQ_REMOVE,
103	argv, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
104	if( fd > 0 ){
105	- shutdown( fd, 1 );
106	+/* shutdown( fd, 1 );*/
107	while( (n = read(fd, msg, sizeof(msg)) ) > 0 ){
108	if( write(1,msg,n) < 0 ) cleanup(0);
109	}
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 @@
113	close(fd);
114	fd = -1;
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",
121	Errormsg(errno) );
122	retval = 1;
123	goto done;
124	- }
125	+ }*/
126	fd = Checkwrite( file, &statb, O_WRONLY\|O_TRUNC, 1, 0 );
127	if( fd < 0 ){
128	SNPRINTF( err, errlen)
129	@@ -1146,7 +1146,7 @@
130	if( status ){
131	SETSTATUS(job) "Printer %s@%s does not support krb4 authentication",
132	RemotePrinter_DYN, host);
133	- shutdown(*sock,1);
134	+/* shutdown(sock,1);/
135	return JFAIL;
136	}
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));
142	- shutdown(*sock,1);
143	+/* shutdown(sock,1);/
144	return JFAIL;
145	}
146	buffer[0] = 0;
147	@@ -1171,7 +1171,7 @@
148	if(status){
149	SNPRINTF(errmsg, errlen) "cannot read status from %s@%s - %s",
150	RemotePrinter_DYN, host );
151	- shutdown(*sock,1);
152	+/* shutdown(sock,1);/
153	return JFAIL;
154	} else {
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 );
160	if( fd >= 0 ){
161	char *tempfile;
162	- shutdown( fd, 1 );
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 );
170	if( fd >= 0 ){
171	- shutdown( fd, 1 );
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
178	@@ -352,7 +352,7 @@
179	fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
180	Send_query_rw_timeout_DYN, *sock );
181	if( fd >= 0 ){
182	- shutdown( fd, 1 );
183	+/* shutdown( fd, 1 );*/
184	while( (c = read(fd,msg,sizeof(msg))) > 0 ){
185	Write_fd_len(*sock,msg,c);
186	}
187	@@ -414,7 +414,7 @@
188	fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
189	Send_query_rw_timeout_DYN, *sock );
190	if( fd >= 0 ){
191	- shutdown( fd, 1 );
192	+/* shutdown( fd, 1 );*/
193	while( (n = read(fd,msg,sizeof(msg))) > 0 ){
194	Write_fd_len(*sock,msg,n);
195	}
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
198	@@ -350,7 +350,7 @@
199	}
200	close(tempfd); tempfd = -1;
201	/* we close the writing side */
202	- shutdown( *sock, 1 );
203	+/* shutdown( sock, 1 );/
204
205	DEBUG1("Test_send: sent file" );
206
207	@@ -724,7 +724,7 @@
208
209	error:
210	if( errmsg[0] && *sock ){
211	- shutdown(*sock,1);
212	+/* shutdown(sock,1);/
213	len = 0;
214	buffer[0] = 0;
215	DEBUG1("md5_connect: error '%s'", errmsg );
216	@@ -1193,7 +1193,7 @@
217	}
218	close(tempfd); tempfd = -1;
219	/* we close the writing side */
220	- shutdown( *sock, 1 );
221	+/* shutdown( sock, 1 );/
222
223	DEBUG1("md5_send: sent file" );
224
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
227	@@ -78,7 +78,7 @@
228	err = JABORT;
229	LOGERR(LOG_INFO)"Do_accounting: write to %s failed", command);
230	}
231	- shutdown(tempfd,1);
232	+/* shutdown(tempfd,1);*/
233	} else {
234	tempfd = Checkwrite( Accounting_file_DYN, &statb, 0, Create_files_DYN, 0 );
235	DEBUG2("Setup_accounting: fd %d", tempfd );