/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 plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2016-03-17 21:14:12 UTC
  • Revision ID: teddy@recompile.se-20160317211412-yp8msw4v4ifx4i4x
Client: Remove dead code in plugin-runner

WCOREDUMP is always a subset of WTERMSIG; ignore WCOREDUMP.

* plugin-runner.c (main): Remove WCOREDUMP clause.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
9
9
 * "browse_callback", and parts of "main".
10
10
 * 
11
11
 * Everything else is
12
 
 * Copyright © 2008-2018 Teddy Hogeborn
13
 
 * Copyright © 2008-2018 Björn Påhlsson
14
 
 * 
15
 
 * This file is part of Mandos.
16
 
 * 
17
 
 * Mandos is free software: you can redistribute it and/or modify it
18
 
 * under the terms of the GNU General Public License as published by
19
 
 * the Free Software Foundation, either version 3 of the License, or
20
 
 * (at your option) any later version.
21
 
 * 
22
 
 * Mandos is distributed in the hope that it will be useful, but
 
12
 * Copyright © 2008-2016 Teddy Hogeborn
 
13
 * Copyright © 2008-2016 Björn Påhlsson
 
14
 * 
 
15
 * This program is free software: you can redistribute it and/or
 
16
 * modify it under the terms of the GNU General Public License as
 
17
 * published by the Free Software Foundation, either version 3 of the
 
18
 * License, or (at your option) any later version.
 
19
 * 
 
20
 * This program is distributed in the hope that it will be useful, but
23
21
 * WITHOUT ANY WARRANTY; without even the implied warranty of
24
22
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
25
23
 * General Public License for more details.
26
24
 * 
27
25
 * You should have received a copy of the GNU General Public License
28
 
 * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
26
 * along with this program.  If not, see
 
27
 * <http://www.gnu.org/licenses/>.
29
28
 * 
30
29
 * Contact the authors at <mandos@recompile.se>.
31
30
 */
48
47
                                   strtof(), abort() */
49
48
#include <stdbool.h>            /* bool, false, true */
50
49
#include <string.h>             /* strcmp(), strlen(), strerror(),
51
 
                                   asprintf(), strncpy(), strsignal()
52
 
                                */
 
50
                                   asprintf(), strncpy() */
53
51
#include <sys/ioctl.h>          /* ioctl */
54
52
#include <sys/types.h>          /* socket(), inet_pton(), sockaddr,
55
53
                                   sockaddr_in6, PF_INET6,
420
418
      if(result == NULL){
421
419
        fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n");
422
420
      } else {
423
 
        if(result->unsupported_algorithm != NULL) {
424
 
          fprintf_plus(stderr, "Unsupported algorithm: %s\n",
425
 
                       result->unsupported_algorithm);
426
 
        }
 
421
        fprintf_plus(stderr, "Unsupported algorithm: %s\n",
 
422
                     result->unsupported_algorithm);
427
423
        fprintf_plus(stderr, "Wrong key usage: %u\n",
428
424
                     result->wrong_key_usage);
429
425
        if(result->file_name != NULL){
615
611
        }
616
612
        params.size += (unsigned int)bytes_read;
617
613
      }
618
 
      ret = close(dhpfile);
619
 
      if(ret == -1){
620
 
        perror_plus("close");
621
 
      }
622
614
      if(params.data == NULL){
623
615
        dhparamsfilename = NULL;
624
616
      }
633
625
                     safer_gnutls_strerror(ret));
634
626
        dhparamsfilename = NULL;
635
627
      }
636
 
      free(params.data);
637
628
    } while(false);
638
629
  }
639
630
  if(dhparamsfilename == NULL){
1086
1077
    bool match = false;
1087
1078
    {
1088
1079
      char *interface = NULL;
1089
 
      while((interface = argz_next(mc->interfaces,
1090
 
                                   mc->interfaces_size,
1091
 
                                   interface))){
 
1080
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
 
1081
                                 interface))){
1092
1082
        if(if_nametoindex(interface) == (unsigned int)if_index){
1093
1083
          match = true;
1094
1084
          break;
1247
1237
           with an explicit route added with the server's address.
1248
1238
           
1249
1239
           Avahi bug reference:
1250
 
           https://lists.freedesktop.org/archives/avahi/2010-February/001833.html
 
1240
           http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1251
1241
           https://bugs.debian.org/587961
1252
1242
        */
1253
1243
        if(debug){
1433
1423
                                               &decrypted_buffer, mc);
1434
1424
    if(decrypted_buffer_size >= 0){
1435
1425
      
1436
 
      clearerr(stdout);
1437
1426
      written = 0;
1438
1427
      while(written < (size_t) decrypted_buffer_size){
1439
1428
        if(quit_now){
1455
1444
        }
1456
1445
        written += (size_t)ret;
1457
1446
      }
1458
 
      ret = fflush(stdout);
1459
 
      if(ret != 0){
1460
 
        int e = errno;
1461
 
        if(debug){
1462
 
          fprintf_plus(stderr, "Error writing encrypted data: %s\n",
1463
 
                       strerror(errno));
1464
 
        }
1465
 
        errno = e;
1466
 
        goto mandos_end;
1467
 
      }
1468
1447
      retval = 0;
1469
1448
    }
1470
1449
  }
1501
1480
  return retval;
1502
1481
}
1503
1482
 
 
1483
__attribute__((nonnull))
1504
1484
static void resolve_callback(AvahiSServiceResolver *r,
1505
1485
                             AvahiIfIndex interface,
1506
1486
                             AvahiProtocol proto,
1661
1641
      perror_plus("ioctl SIOCGIFFLAGS");
1662
1642
      errno = old_errno;
1663
1643
    }
1664
 
    if((close(s) == -1) and debug){
1665
 
      old_errno = errno;
1666
 
      perror_plus("close");
1667
 
      errno = old_errno;
1668
 
    }
1669
1644
    return false;
1670
1645
  }
1671
 
  if((close(s) == -1) and debug){
1672
 
    old_errno = errno;
1673
 
    perror_plus("close");
1674
 
    errno = old_errno;
1675
 
  }
1676
1646
  return true;
1677
1647
}
1678
1648
 
1939
1909
      return;
1940
1910
    }
1941
1911
  }
1942
 
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1943
 
  if(devnull == -1){
1944
 
    perror_plus("open(\"/dev/null\", O_RDONLY)");
1945
 
    return;
1946
 
  }
1947
1912
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1948
1913
                           runnable_hook, alphasort);
1949
1914
  if(numhooks == -1){
1950
1915
    perror_plus("scandir");
1951
 
    close(devnull);
1952
1916
    return;
1953
1917
  }
1954
1918
  struct dirent *direntry;
1955
1919
  int ret;
 
1920
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
 
1921
  if(devnull == -1){
 
1922
    perror_plus("open(\"/dev/null\", O_RDONLY)");
 
1923
    return;
 
1924
  }
1956
1925
  for(int i = 0; i < numhooks; i++){
1957
1926
    direntry = direntries[i];
1958
1927
    if(debug){
2214
2183
  
2215
2184
  /* Sleep checking until interface is running.
2216
2185
     Check every 0.25s, up to total time of delay */
2217
 
  for(int i = 0; i < delay * 4; i++){
 
2186
  for(int i=0; i < delay * 4; i++){
2218
2187
    if(interface_is_running(interface)){
2219
2188
      break;
2220
2189
    }
2516
2485
  
2517
2486
  {
2518
2487
    /* Work around Debian bug #633582:
2519
 
       <https://bugs.debian.org/633582> */
 
2488
       <http://bugs.debian.org/633582> */
2520
2489
    
2521
2490
    /* Re-raise privileges */
2522
2491
    ret = raise_privileges();
2977
2946
 end:
2978
2947
  
2979
2948
  if(debug){
2980
 
    if(signal_received){
2981
 
      fprintf_plus(stderr, "%s exiting due to signal %d: %s\n",
2982
 
                   argv[0], signal_received,
2983
 
                   strsignal(signal_received));
2984
 
    } else {
2985
 
      fprintf_plus(stderr, "%s exiting\n", argv[0]);
2986
 
    }
 
2949
    fprintf_plus(stderr, "%s exiting\n", argv[0]);
2987
2950
  }
2988
2951
  
2989
2952
  /* Cleanup things */
3041
3004
      /* Take down the network interfaces which were brought up */
3042
3005
      {
3043
3006
        char *interface = NULL;
3044
 
        while((interface = argz_next(interfaces_to_take_down,
3045
 
                                     interfaces_to_take_down_size,
3046
 
                                     interface))){
 
3007
        while((interface=argz_next(interfaces_to_take_down,
 
3008
                                   interfaces_to_take_down_size,
 
3009
                                   interface))){
3047
3010
          ret = take_down_interface(interface);
3048
3011
          if(ret != 0){
3049
3012
            errno = ret;
3078
3041
                                                | O_PATH));
3079
3042
    if(dir_fd == -1){
3080
3043
      perror_plus("open");
3081
 
      return;
3082
3044
    }
3083
3045
    int numentries = scandirat(dir_fd, ".", &direntries,
3084
3046
                               notdotentries, alphasort);
3101
3063
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3102
3064
            dret = 0;
3103
3065
          }
3104
 
          if((dret == -1) and (errno != ENOENT)){
 
3066
          if(dret == -1){
3105
3067
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3106
3068
                         direntries[i]->d_name, strerror(errno));
3107
3069
          }
3111
3073
      
3112
3074
      /* need to clean even if 0 because man page doesn't specify */
3113
3075
      free(direntries);
 
3076
      if(numentries == -1){
 
3077
        perror_plus("scandirat");
 
3078
      }
3114
3079
      dret = unlinkat(base, dirname, AT_REMOVEDIR);
3115
3080
      if(dret == -1 and errno != ENOENT){
3116
3081
        perror_plus("rmdir");