/mandos/release

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

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2016-07-03 02:56:00 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 350.
  • Revision ID: teddy@recompile.se-20160703025600-bn12vpzejr6zxx5v
mandos-client: Bug fix: flush stdout to detect write errors.

* plugins.d/mandos-client.c (start_mandos_communication): Do
                            fflush(stdout) to detect any write errors.

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,
613
611
        }
614
612
        params.size += (unsigned int)bytes_read;
615
613
      }
616
 
      ret = close(dhpfile);
617
 
      if(ret == -1){
618
 
        perror_plus("close");
619
 
      }
620
614
      if(params.data == NULL){
621
615
        dhparamsfilename = NULL;
622
616
      }
631
625
                     safer_gnutls_strerror(ret));
632
626
        dhparamsfilename = NULL;
633
627
      }
634
 
      free(params.data);
635
628
    } while(false);
636
629
  }
637
630
  if(dhparamsfilename == NULL){
1084
1077
    bool match = false;
1085
1078
    {
1086
1079
      char *interface = NULL;
1087
 
      while((interface = argz_next(mc->interfaces,
1088
 
                                   mc->interfaces_size,
1089
 
                                   interface))){
 
1080
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
 
1081
                                 interface))){
1090
1082
        if(if_nametoindex(interface) == (unsigned int)if_index){
1091
1083
          match = true;
1092
1084
          break;
1245
1237
           with an explicit route added with the server's address.
1246
1238
           
1247
1239
           Avahi bug reference:
1248
 
           https://lists.freedesktop.org/archives/avahi/2010-February/001833.html
 
1240
           http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1249
1241
           https://bugs.debian.org/587961
1250
1242
        */
1251
1243
        if(debug){
1499
1491
  return retval;
1500
1492
}
1501
1493
 
 
1494
__attribute__((nonnull))
1502
1495
static void resolve_callback(AvahiSServiceResolver *r,
1503
1496
                             AvahiIfIndex interface,
1504
1497
                             AvahiProtocol proto,
1659
1652
      perror_plus("ioctl SIOCGIFFLAGS");
1660
1653
      errno = old_errno;
1661
1654
    }
1662
 
    if((close(s) == -1) and debug){
1663
 
      old_errno = errno;
1664
 
      perror_plus("close");
1665
 
      errno = old_errno;
1666
 
    }
1667
1655
    return false;
1668
1656
  }
1669
 
  if((close(s) == -1) and debug){
1670
 
    old_errno = errno;
1671
 
    perror_plus("close");
1672
 
    errno = old_errno;
1673
 
  }
1674
1657
  return true;
1675
1658
}
1676
1659
 
1937
1920
      return;
1938
1921
    }
1939
1922
  }
1940
 
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1941
 
  if(devnull == -1){
1942
 
    perror_plus("open(\"/dev/null\", O_RDONLY)");
1943
 
    return;
1944
 
  }
1945
1923
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1946
1924
                           runnable_hook, alphasort);
1947
1925
  if(numhooks == -1){
1948
1926
    perror_plus("scandir");
1949
 
    close(devnull);
1950
1927
    return;
1951
1928
  }
1952
1929
  struct dirent *direntry;
1953
1930
  int ret;
 
1931
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
 
1932
  if(devnull == -1){
 
1933
    perror_plus("open(\"/dev/null\", O_RDONLY)");
 
1934
    return;
 
1935
  }
1954
1936
  for(int i = 0; i < numhooks; i++){
1955
1937
    direntry = direntries[i];
1956
1938
    if(debug){
2212
2194
  
2213
2195
  /* Sleep checking until interface is running.
2214
2196
     Check every 0.25s, up to total time of delay */
2215
 
  for(int i = 0; i < delay * 4; i++){
 
2197
  for(int i=0; i < delay * 4; i++){
2216
2198
    if(interface_is_running(interface)){
2217
2199
      break;
2218
2200
    }
2514
2496
  
2515
2497
  {
2516
2498
    /* Work around Debian bug #633582:
2517
 
       <https://bugs.debian.org/633582> */
 
2499
       <http://bugs.debian.org/633582> */
2518
2500
    
2519
2501
    /* Re-raise privileges */
2520
2502
    ret = raise_privileges();
2975
2957
 end:
2976
2958
  
2977
2959
  if(debug){
2978
 
    if(signal_received){
2979
 
      fprintf_plus(stderr, "%s exiting due to signal %d: %s\n",
2980
 
                   argv[0], signal_received,
2981
 
                   strsignal(signal_received));
2982
 
    } else {
2983
 
      fprintf_plus(stderr, "%s exiting\n", argv[0]);
2984
 
    }
 
2960
    fprintf_plus(stderr, "%s exiting\n", argv[0]);
2985
2961
  }
2986
2962
  
2987
2963
  /* Cleanup things */
3039
3015
      /* Take down the network interfaces which were brought up */
3040
3016
      {
3041
3017
        char *interface = NULL;
3042
 
        while((interface = argz_next(interfaces_to_take_down,
3043
 
                                     interfaces_to_take_down_size,
3044
 
                                     interface))){
 
3018
        while((interface=argz_next(interfaces_to_take_down,
 
3019
                                   interfaces_to_take_down_size,
 
3020
                                   interface))){
3045
3021
          ret = take_down_interface(interface);
3046
3022
          if(ret != 0){
3047
3023
            errno = ret;
3076
3052
                                                | O_PATH));
3077
3053
    if(dir_fd == -1){
3078
3054
      perror_plus("open");
3079
 
      return;
3080
3055
    }
3081
3056
    int numentries = scandirat(dir_fd, ".", &direntries,
3082
3057
                               notdotentries, alphasort);
3099
3074
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3100
3075
            dret = 0;
3101
3076
          }
3102
 
          if((dret == -1) and (errno != ENOENT)){
 
3077
          if(dret == -1){
3103
3078
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3104
3079
                         direntries[i]->d_name, strerror(errno));
3105
3080
          }
3109
3084
      
3110
3085
      /* need to clean even if 0 because man page doesn't specify */
3111
3086
      free(direntries);
 
3087
      if(numentries == -1){
 
3088
        perror_plus("scandirat");
 
3089
      }
3112
3090
      dret = unlinkat(base, dirname, AT_REMOVEDIR);
3113
3091
      if(dret == -1 and errno != ENOENT){
3114
3092
        perror_plus("rmdir");