/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: 2018-02-22 18:34:39 UTC
  • mfrom: (942 trunk)
  • mto: This revision was merged to the branch mainline in revision 943.
  • Revision ID: teddy@recompile.se-20180222183439-ardlmmsvs6jbkp8x
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
613
613
        }
614
614
        params.size += (unsigned int)bytes_read;
615
615
      }
 
616
      ret = close(dhpfile);
 
617
      if(ret == -1){
 
618
        perror_plus("close");
 
619
      }
616
620
      if(params.data == NULL){
617
621
        dhparamsfilename = NULL;
618
622
      }
1655
1659
      perror_plus("ioctl SIOCGIFFLAGS");
1656
1660
      errno = old_errno;
1657
1661
    }
 
1662
    if((close(s) == -1) and debug){
 
1663
      old_errno = errno;
 
1664
      perror_plus("close");
 
1665
      errno = old_errno;
 
1666
    }
1658
1667
    return false;
1659
1668
  }
 
1669
  if((close(s) == -1) and debug){
 
1670
    old_errno = errno;
 
1671
    perror_plus("close");
 
1672
    errno = old_errno;
 
1673
  }
1660
1674
  return true;
1661
1675
}
1662
1676
 
1923
1937
      return;
1924
1938
    }
1925
1939
  }
 
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
  }
1926
1945
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1927
1946
                           runnable_hook, alphasort);
1928
1947
  if(numhooks == -1){
1929
1948
    perror_plus("scandir");
 
1949
    close(devnull);
1930
1950
    return;
1931
1951
  }
1932
1952
  struct dirent *direntry;
1933
1953
  int ret;
1934
 
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1935
 
  if(devnull == -1){
1936
 
    perror_plus("open(\"/dev/null\", O_RDONLY)");
1937
 
    return;
1938
 
  }
1939
1954
  for(int i = 0; i < numhooks; i++){
1940
1955
    direntry = direntries[i];
1941
1956
    if(debug){
3061
3076
                                                | O_PATH));
3062
3077
    if(dir_fd == -1){
3063
3078
      perror_plus("open");
 
3079
      return;
3064
3080
    }
3065
3081
    int numentries = scandirat(dir_fd, ".", &direntries,
3066
3082
                               notdotentries, alphasort);
3083
3099
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3084
3100
            dret = 0;
3085
3101
          }
3086
 
          if(dret == -1){
 
3102
          if((dret == -1) and (errno != ENOENT)){
3087
3103
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3088
3104
                         direntries[i]->d_name, strerror(errno));
3089
3105
          }
3093
3109
      
3094
3110
      /* need to clean even if 0 because man page doesn't specify */
3095
3111
      free(direntries);
3096
 
      if(numentries == -1){
3097
 
        perror_plus("scandirat");
3098
 
      }
3099
3112
      dret = unlinkat(base, dirname, AT_REMOVEDIR);
3100
3113
      if(dret == -1 and errno != ENOENT){
3101
3114
        perror_plus("rmdir");