/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: 2017-08-20 14:41:20 UTC
  • Revision ID: teddy@recompile.se-20170820144120-ee0hsyhvo1geg8ms
Handle multiple lines better in cryptroot file.

* initramfs-tools-script: Avoid running plugin-runner more than once
  if the root file system device is specially marked in the cryptroot
  file.  Also never run plugin-runner for a resume (usually swap)
  device.

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
 
12
 * Copyright © 2008-2017 Teddy Hogeborn
 
13
 * Copyright © 2008-2017 Björn Påhlsson
14
14
 * 
15
15
 * This program is free software: you can redistribute it and/or
16
16
 * modify it under the terms of the GNU General Public License as
626
626
                     safer_gnutls_strerror(ret));
627
627
        dhparamsfilename = NULL;
628
628
      }
 
629
      free(params.data);
629
630
    } while(false);
630
631
  }
631
632
  if(dhparamsfilename == NULL){
1078
1079
    bool match = false;
1079
1080
    {
1080
1081
      char *interface = NULL;
1081
 
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
1082
 
                                 interface))){
 
1082
      while((interface = argz_next(mc->interfaces,
 
1083
                                   mc->interfaces_size,
 
1084
                                   interface))){
1083
1085
        if(if_nametoindex(interface) == (unsigned int)if_index){
1084
1086
          match = true;
1085
1087
          break;
1492
1494
  return retval;
1493
1495
}
1494
1496
 
1495
 
__attribute__((nonnull))
1496
1497
static void resolve_callback(AvahiSServiceResolver *r,
1497
1498
                             AvahiIfIndex interface,
1498
1499
                             AvahiProtocol proto,
2195
2196
  
2196
2197
  /* Sleep checking until interface is running.
2197
2198
     Check every 0.25s, up to total time of delay */
2198
 
  for(int i=0; i < delay * 4; i++){
 
2199
  for(int i = 0; i < delay * 4; i++){
2199
2200
    if(interface_is_running(interface)){
2200
2201
      break;
2201
2202
    }
3022
3023
      /* Take down the network interfaces which were brought up */
3023
3024
      {
3024
3025
        char *interface = NULL;
3025
 
        while((interface=argz_next(interfaces_to_take_down,
3026
 
                                   interfaces_to_take_down_size,
3027
 
                                   interface))){
 
3026
        while((interface = argz_next(interfaces_to_take_down,
 
3027
                                     interfaces_to_take_down_size,
 
3028
                                     interface))){
3028
3029
          ret = take_down_interface(interface);
3029
3030
          if(ret != 0){
3030
3031
            errno = ret;