/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 plugin-runner.c

Support not using IPv6 in server:

* mandos (AvahiService.__init__): Take new "protocol" parameter.  All
                                  callers changed.
  (IPv6_TCPServer.__init__): Take new "use_ipv6" parameter.  All
                             callers changed.
  (IPv6_TCPServer.server_bind): Create IPv4 socket if not using IPv6.
  (main): New "--no-ipv6" command line option.  New "use_ipv6" config
          option.
* mandos-options.xml ([@id="address"]): Document conditional IPv4
                                        address support.
  ([@id="ipv6"]): New paragraph.
* mandos.conf (use_ipv6): New config option.
* mandos.conf.xml (OPTIONS): Document new "use_dbus" option.
  (EXAMPLE): Changed to use IPv6 link-local address.  Added "use_ipv6"
             option.
* mandos.xml (SYNOPSIS): New "--no-ipv6" option.
  (OPTIONS): Document new "--no-ipv6" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
457
457
      plugindir = strdup(arg);
458
458
      if(plugindir == NULL){
459
459
        perror("strdup");
460
 
      }
 
460
      }      
461
461
      break;
462
462
    case 129:                   /* --config-file */
463
463
      /* This is already done by parse_opt_config_file() */
527
527
      if(argfile == NULL){
528
528
        perror("strdup");
529
529
      }
530
 
      break;
 
530
      break;      
531
531
    case 130:                   /* --userid */
532
532
    case 131:                   /* --groupid */
533
533
    case 132:                   /* --debug */
562
562
    conffp = fopen(AFILE, "r");
563
563
  } else {
564
564
    conffp = fopen(argfile, "r");
565
 
  }
 
565
  }  
566
566
  if(conffp != NULL){
567
567
    char *org_line = NULL;
568
568
    char *p, *arg, *new_arg, *line;
612
612
          goto fallback;
613
613
        }
614
614
        custom_argv[custom_argc-1] = new_arg;
615
 
        custom_argv[custom_argc] = NULL;
 
615
        custom_argv[custom_argc] = NULL;        
616
616
      }
617
617
    }
618
618
    free(org_line);