/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-04-01 19:27:30 UTC
  • Revision ID: teddy@recompile.se-20180401192730-jwr4io5cb3x5u268
Don't print NULL string pointers in error message output

* plugins.d/mandos-client.c (pgp_packet_decrypt): If decryption fails,
  don't print unsupported_algorithm if it is NULL.

Show diffs side-by-side

added added

removed removed

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