/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-18 00:40:22 UTC
  • Revision ID: teddy@recompile.se-20180218004022-p36ucpmiwok1tkdi
Client: Don't print failures to remove nonexisting files.

* plugins.d/mandos-client.d (main/clean_dir_at): Only print failures
  from unlinkat() if errno != ENOENT.

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-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
 
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
21
23
 * WITHOUT ANY WARRANTY; without even the implied warranty of
22
24
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
23
25
 * General Public License for more details.
24
26
 * 
25
27
 * You should have received a copy of the GNU General Public License
26
 
 * along with this program.  If not, see
27
 
 * <http://www.gnu.org/licenses/>.
 
28
 * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
28
29
 * 
29
30
 * Contact the authors at <mandos@recompile.se>.
30
31
 */
47
48
                                   strtof(), abort() */
48
49
#include <stdbool.h>            /* bool, false, true */
49
50
#include <string.h>             /* strcmp(), strlen(), strerror(),
50
 
                                   asprintf(), strncpy() */
 
51
                                   asprintf(), strncpy(), strsignal()
 
52
                                */
51
53
#include <sys/ioctl.h>          /* ioctl */
52
54
#include <sys/types.h>          /* socket(), inet_pton(), sockaddr,
53
55
                                   sockaddr_in6, PF_INET6,
625
627
                     safer_gnutls_strerror(ret));
626
628
        dhparamsfilename = NULL;
627
629
      }
 
630
      free(params.data);
628
631
    } while(false);
629
632
  }
630
633
  if(dhparamsfilename == NULL){
1077
1080
    bool match = false;
1078
1081
    {
1079
1082
      char *interface = NULL;
1080
 
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
1081
 
                                 interface))){
 
1083
      while((interface = argz_next(mc->interfaces,
 
1084
                                   mc->interfaces_size,
 
1085
                                   interface))){
1082
1086
        if(if_nametoindex(interface) == (unsigned int)if_index){
1083
1087
          match = true;
1084
1088
          break;
1237
1241
           with an explicit route added with the server's address.
1238
1242
           
1239
1243
           Avahi bug reference:
1240
 
           http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
 
1244
           https://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1241
1245
           https://bugs.debian.org/587961
1242
1246
        */
1243
1247
        if(debug){
1423
1427
                                               &decrypted_buffer, mc);
1424
1428
    if(decrypted_buffer_size >= 0){
1425
1429
      
 
1430
      clearerr(stdout);
1426
1431
      written = 0;
1427
1432
      while(written < (size_t) decrypted_buffer_size){
1428
1433
        if(quit_now){
1444
1449
        }
1445
1450
        written += (size_t)ret;
1446
1451
      }
 
1452
      ret = fflush(stdout);
 
1453
      if(ret != 0){
 
1454
        int e = errno;
 
1455
        if(debug){
 
1456
          fprintf_plus(stderr, "Error writing encrypted data: %s\n",
 
1457
                       strerror(errno));
 
1458
        }
 
1459
        errno = e;
 
1460
        goto mandos_end;
 
1461
      }
1447
1462
      retval = 0;
1448
1463
    }
1449
1464
  }
1480
1495
  return retval;
1481
1496
}
1482
1497
 
1483
 
__attribute__((nonnull))
1484
1498
static void resolve_callback(AvahiSServiceResolver *r,
1485
1499
                             AvahiIfIndex interface,
1486
1500
                             AvahiProtocol proto,
2183
2197
  
2184
2198
  /* Sleep checking until interface is running.
2185
2199
     Check every 0.25s, up to total time of delay */
2186
 
  for(int i=0; i < delay * 4; i++){
 
2200
  for(int i = 0; i < delay * 4; i++){
2187
2201
    if(interface_is_running(interface)){
2188
2202
      break;
2189
2203
    }
2485
2499
  
2486
2500
  {
2487
2501
    /* Work around Debian bug #633582:
2488
 
       <http://bugs.debian.org/633582> */
 
2502
       <https://bugs.debian.org/633582> */
2489
2503
    
2490
2504
    /* Re-raise privileges */
2491
2505
    ret = raise_privileges();
2946
2960
 end:
2947
2961
  
2948
2962
  if(debug){
2949
 
    fprintf_plus(stderr, "%s exiting\n", argv[0]);
 
2963
    if(signal_received){
 
2964
      fprintf_plus(stderr, "%s exiting due to signal %d: %s\n",
 
2965
                   argv[0], signal_received,
 
2966
                   strsignal(signal_received));
 
2967
    } else {
 
2968
      fprintf_plus(stderr, "%s exiting\n", argv[0]);
 
2969
    }
2950
2970
  }
2951
2971
  
2952
2972
  /* Cleanup things */
3004
3024
      /* Take down the network interfaces which were brought up */
3005
3025
      {
3006
3026
        char *interface = NULL;
3007
 
        while((interface=argz_next(interfaces_to_take_down,
3008
 
                                   interfaces_to_take_down_size,
3009
 
                                   interface))){
 
3027
        while((interface = argz_next(interfaces_to_take_down,
 
3028
                                     interfaces_to_take_down_size,
 
3029
                                     interface))){
3010
3030
          ret = take_down_interface(interface);
3011
3031
          if(ret != 0){
3012
3032
            errno = ret;
3063
3083
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3064
3084
            dret = 0;
3065
3085
          }
3066
 
          if(dret == -1){
 
3086
          if((dret == -1) and (errno != ENOENT)){
3067
3087
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3068
3088
                         direntries[i]->d_name, strerror(errno));
3069
3089
          }