/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-10 21:07:42 UTC
  • mfrom: (237.4.94 release)
  • Revision ID: teddy@recompile.se-20180210210742-v7hu1g3x5jpix3zx
Merge from release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
1923
1923
      return;
1924
1924
    }
1925
1925
  }
1926
 
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1927
 
  if(devnull == -1){
1928
 
    perror_plus("open(\"/dev/null\", O_RDONLY)");
1929
 
    return;
1930
 
  }
1931
1926
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1932
1927
                           runnable_hook, alphasort);
1933
1928
  if(numhooks == -1){
1934
1929
    perror_plus("scandir");
1935
 
    close(devnull);
1936
1930
    return;
1937
1931
  }
1938
1932
  struct dirent *direntry;
1939
1933
  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
  }
1940
1939
  for(int i = 0; i < numhooks; i++){
1941
1940
    direntry = direntries[i];
1942
1941
    if(debug){
3062
3061
                                                | O_PATH));
3063
3062
    if(dir_fd == -1){
3064
3063
      perror_plus("open");
3065
 
      return;
3066
3064
    }
3067
3065
    int numentries = scandirat(dir_fd, ".", &direntries,
3068
3066
                               notdotentries, alphasort);
3085
3083
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3086
3084
            dret = 0;
3087
3085
          }
3088
 
          if((dret == -1) and (errno != ENOENT)){
 
3086
          if(dret == -1){
3089
3087
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3090
3088
                         direntries[i]->d_name, strerror(errno));
3091
3089
          }
3095
3093
      
3096
3094
      /* need to clean even if 0 because man page doesn't specify */
3097
3095
      free(direntries);
 
3096
      if(numentries == -1){
 
3097
        perror_plus("scandirat");
 
3098
      }
3098
3099
      dret = unlinkat(base, dirname, AT_REMOVEDIR);
3099
3100
      if(dret == -1 and errno != ENOENT){
3100
3101
        perror_plus("rmdir");