/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugin-runner.c

  • Committer: Teddy Hogeborn
  • Date: 2014-01-21 21:04:25 UTC
  • mto: This revision was merged to the branch mainline in revision 653.
  • Revision ID: teddy@recompile.se-20140121210425-j1bgxxghrb751jej
Tags: version-1.6.3-1
* Makefile (version): Changed to "1.3.2".
* NEWS (Version 1.6.3): New entry.
* debian/changelog (1.6.3-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1071
1071
      goto fallback;
1072
1072
    }
1073
1073
    
 
1074
#if defined (__GNUC__) and defined (__GLIBC__)
 
1075
#if not __GLIBC_PREREQ(2, 16)
 
1076
#pragma GCC diagnostic push
 
1077
#pragma GCC diagnostic ignored "-Wsign-conversion"
 
1078
#endif
 
1079
#endif
1074
1080
    FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1075
 
                                          -Wconversion */
 
1081
                                          -Wconversion in GNU libc
 
1082
                                          before 2.16 */
 
1083
#if defined (__GNUC__) and defined (__GLIBC__)
 
1084
#if not __GLIBC_PREREQ(2, 16)
 
1085
#pragma GCC diagnostic pop
 
1086
#endif
 
1087
#endif
1076
1088
    
1077
1089
    if(maxfd < new_plugin->fd){
1078
1090
      maxfd = new_plugin->fd;
1132
1144
          }
1133
1145
          
1134
1146
          /* Remove the plugin */
 
1147
#if defined (__GNUC__) and defined (__GLIBC__)
 
1148
#if not __GLIBC_PREREQ(2, 16)
 
1149
#pragma GCC diagnostic push
 
1150
#pragma GCC diagnostic ignored "-Wsign-conversion"
 
1151
#endif
 
1152
#endif
1135
1153
          FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1136
 
                                          -Wconversion */
 
1154
                                          -Wconversion in GNU libc
 
1155
                                          before 2.16 */
 
1156
#if defined (__GNUC__) and defined (__GLIBC__)
 
1157
#if not __GLIBC_PREREQ(2, 16)
 
1158
#pragma GCC diagnostic pop
 
1159
#endif
 
1160
#endif
1137
1161
          
1138
1162
          /* Block signal while modifying process_list */
1139
1163
          ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1179
1203
      }
1180
1204
      
1181
1205
      /* This process has not completed.  Does it have any output? */
 
1206
#if defined (__GNUC__) and defined (__GLIBC__)
 
1207
#if not __GLIBC_PREREQ(2, 16)
 
1208
#pragma GCC diagnostic push
 
1209
#pragma GCC diagnostic ignored "-Wsign-conversion"
 
1210
#endif
 
1211
#endif
1182
1212
      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1183
1213
                                                         warning from
1184
 
                                                         -Wconversion */
 
1214
                                                         -Wconversion
 
1215
                                                         in GNU libc
 
1216
                                                         before
 
1217
                                                         2.16 */
 
1218
#if defined (__GNUC__) and defined (__GLIBC__)
 
1219
#if not __GLIBC_PREREQ(2, 16)
 
1220
#pragma GCC diagnostic pop
 
1221
#endif
 
1222
#endif
1185
1223
        /* This process had nothing to say at this time */
1186
1224
        proc = proc->next;
1187
1225
        continue;