/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: 2019-07-28 14:39:47 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190728143947-gfv94wjdal3rgk6b
Update Python 3 compatibility

* mandos (gnutls.ClientSession.__init__): Use byte string argument to
                                          check_version() instead of a
                                          unicode string.
  (gnutls): - '' -
  (ClientHandler.handle): Change default values for "fpr" and "key_id"
                          to be byte strings instead of unicode
                          strings.
  (main): Use "key in dict" instead of "dict.has_key(key)".
* mandos-ctl: Fix Emacs test runner to use "--check" instead of
              "--test".
  (rfc3339_duration_to_delta): Change doctest string to not depend on
                               exact repr() string representation of
                               values and instead do value
                               comparisons.
  (parse_pre_1_6_1_interval): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
396
396
        fprintf_plus(stderr,
397
397
                     "Setting system clock to key file mtime");
398
398
      }
399
 
      if(clock_settime(CLOCK_REALTIME, &keystat.st_mtim) != 0){
400
 
        perror_plus("clock_settime");
 
399
      time_t keytime = keystat.st_mtim.tv_sec;
 
400
      if(stime(&keytime) != 0){
 
401
        perror_plus("stime");
401
402
      }
402
403
      ret = lower_privileges();
403
404
      if(ret != 0){
1073
1074
      ret = setgid(0);
1074
1075
      if(ret == -1){
1075
1076
        perror_plus("setgid");
1076
 
        close(devnull);
1077
1077
        _exit(EX_NOPERM);
1078
1078
      }
1079
1079
      /* Reset supplementary groups */
1081
1081
      ret = setgroups(0, NULL);
1082
1082
      if(ret == -1){
1083
1083
        perror_plus("setgroups");
1084
 
        close(devnull);
1085
1084
        _exit(EX_NOPERM);
1086
1085
      }
1087
1086
    }
1088
1087
    ret = dup2(devnull, STDIN_FILENO);
1089
1088
    if(ret == -1){
1090
1089
      perror_plus("dup2(devnull, STDIN_FILENO)");
1091
 
      close(devnull);
1092
1090
      _exit(EX_OSERR);
1093
1091
    }
1094
1092
    ret = close(devnull);
1095
1093
    if(ret == -1){
1096
1094
      perror_plus("close");
 
1095
      _exit(EX_OSERR);
1097
1096
    }
1098
1097
    ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1099
1098
    if(ret == -1){
1134
1133
  }
1135
1134
  if(pid == -1){
1136
1135
    perror_plus("fork");
1137
 
    close(devnull);
1138
1136
    return false;
1139
1137
  }
1140
 
  ret = close(devnull);
1141
 
  if(ret == -1){
1142
 
    perror_plus("close");
1143
 
  }
1144
1138
  int status;
1145
1139
  pid_t pret = -1;
1146
1140
  errno = 0;