LPRng-shutdown.patch

   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
   3 @@ -157,7 +157,7 @@
   4                                 tempfile);
   5                 }
   6                 /* we turn off IO from the socket */
   7 -               shutdown(*sock,1);
   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",
  12 @@ -345,7 +345,7 @@
  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
  23 @@ -243,7 +243,6 @@
  24         fd = Send_request( 'Q', Displayformat,
  25                 0, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
  26         if( fd >= 0 ){
  27 -               /* shutdown( fd, 1 ); */
  28                 Read_status_info( RemoteHost_DYN, fd,
  29                         1, Send_query_rw_timeout_DYN, display_format,
  30                         Status_line_count );
  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
  33 @@ -364,7 +364,7 @@
  34                 fd = Send_request( 'C', REQ_CONTROL, l.list, Connect_timeout_DYN,
  35                         Send_query_rw_timeout_DYN, 1 );
  36                 if( fd > 0 ){
  37 -                       shutdown( fd, 1 );
  38 +/*                     shutdown( fd, 1 );*/
  39                         while( (n = read(fd, msg, sizeof(msg))) > 0 ){
  40                                 if( (write(1,msg,n)) < 0 ) cleanup(0);
  41                         }
  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
  44 @@ -222,7 +222,7 @@
  45                 DEBUG1("lpr: after shutdown fd %d, status_fd %d", fd, status_fd );
  46                 if( status_fd > 0 ){
  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 */
  51                         buffer[0] = 0;
  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
  55 @@ -239,7 +239,6 @@
  56                 &argv[Optind], Connect_timeout_DYN,
  57                 Send_query_rw_timeout_DYN, 1 );
  58         if( fd >= 0 ){
  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
  65 @@ -3642,7 +3642,7 @@
  66         if( fd < 0 || fstat( fd, &statb ) == -1 ){
  67                 fd = -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)){
  71                 close(fd);
  72                 fd = -1;
  73         }
  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
  76 @@ -244,7 +244,7 @@
  77         fd = Send_request( 'M', REQ_REMOVE,
  78                 argv, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
  79         if( fd > 0 ){
  80 -               shutdown( fd, 1 );
  81 +/*             shutdown( fd, 1 );*/
  82                 while( (n = read(fd, msg, sizeof(msg)) ) > 0 ){
  83                         if( write(1,msg,n) < 0 ) cleanup(0);
  84                 }
  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
  87 @@ -698,14 +698,14 @@
  88         close(fd);
  89         fd = -1;
  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",
  96                         Errormsg(errno) );
  97                 retval = 1;
  98                 goto done;
  99 -       }
 100 +       }*/
 101         fd = Checkwrite( file, &statb, O_WRONLY|O_TRUNC, 1, 0 );
 102         if( fd < 0 ){
 103                 SNPRINTF( err, errlen)
 104 @@ -1146,7 +1146,7 @@
 105         if( status ){
 106                 SETSTATUS(job) "Printer %s@%s does not support krb4 authentication",
 107                         RemotePrinter_DYN, host);
 108 -               shutdown(*sock,1);
 109 +/*             shutdown(*sock,1);*/
 110                 return JFAIL;
 111         }
 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));
 117 -               shutdown(*sock,1);
 118 +/*             shutdown(*sock,1);*/
 119                 return JFAIL;
 120         }
 121         buffer[0] = 0;
 122 @@ -1171,7 +1171,7 @@
 123         if(status){
 124                 SNPRINTF(errmsg, errlen) "cannot read status from %s@%s - %s",
 125                         RemotePrinter_DYN, host );
 126 -               shutdown(*sock,1);
 127 +/*             shutdown(*sock,1);*/
 128                 return JFAIL;
 129         } else {
 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 );
 135                                 if( fd >= 0 ){
 136                                         char *tempfile;
 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 );
 144                 if( fd >= 0 ){
 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
 151 @@ -352,7 +352,7 @@
 152                         fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
 153                                 Send_query_rw_timeout_DYN, *sock );
 154                         if( fd >= 0 ){
 155 -                               shutdown( fd, 1 );
 156 +/*                             shutdown( fd, 1 );*/
 157                                 while( (c = read(fd,msg,sizeof(msg))) > 0 ){
 158                                         Write_fd_len(*sock,msg,c);
 159                                 }
 160 @@ -414,7 +414,7 @@
 161         fd = Send_request( 'M', REQ_REMOVE, tokens->list, Connect_timeout_DYN,
 162                 Send_query_rw_timeout_DYN, *sock );
 163         if( fd >= 0 ){
 164 -               shutdown( fd, 1 );
 165 +/*             shutdown( fd, 1 );*/
 166                 while( (n = read(fd,msg,sizeof(msg))) > 0 ){
 167                         Write_fd_len(*sock,msg,n);
 168                 }
 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
 171 @@ -350,7 +350,7 @@
 172         }
 173         close(tempfd); tempfd = -1;
 174         /* we close the writing side */
 175 -       shutdown( *sock, 1 );
 176 +/*     shutdown( *sock, 1 );*/
 177
 178         DEBUG1("Test_send: sent file" );
 179
 180 @@ -724,7 +724,7 @@
 181
 182    error:
 183         if( errmsg[0] && *sock ){
 184 -               shutdown(*sock,1);
 185 +/*             shutdown(*sock,1);*/
 186                 len = 0;
 187                 buffer[0] = 0;
 188                 DEBUG1("md5_connect: error '%s'", errmsg );
 189 @@ -1193,7 +1193,7 @@
 190         }
 191         close(tempfd); tempfd = -1;
 192         /* we close the writing side */
 193 -       shutdown( *sock, 1 );
 194 +/*     shutdown( *sock, 1 );*/
 195
 196         DEBUG1("md5_send: sent file" );
 197
 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
 200 @@ -143,7 +143,6 @@
 201                                 Errorcode= JFAIL;
 202                                 LOGERR_DIE(LOG_INFO)"Do_accounting: write to '%s' failed", command);
 203                         }
 204 -                       shutdown(tempfd,1);
 205                 } else {
 206                         tempfd = Checkwrite( Accounting_file_DYN, &statb, 0, Create_files_DYN, 0 );
 207                         DEBUG2("Setup_accounting: fd %d", tempfd );