/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: 2011-12-31 20:07:11 UTC
  • mfrom: (535.1.9 wireless-network-hook)
  • Revision ID: teddy@recompile.se-20111231200711-6dli3r8drftem57r
Merge new wireless network hook.  Fix bridge network hook to use
hardware addresses instead of interface names.  Implement and document
new "CONNECT" environment variable for network hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1450
1450
          perror_plus("setenv");
1451
1451
          _exit(EX_OSERR);
1452
1452
        }
1453
 
        ret = setenv("VERBOSE", debug ? "1" : "0", 1);
 
1453
        ret = setenv("VERBOSITY", debug ? "1" : "0", 1);
1454
1454
        if(ret == -1){
1455
1455
          perror_plus("setenv");
1456
1456
          _exit(EX_OSERR);
1473
1473
          _exit(EX_OSERR);
1474
1474
        }
1475
1475
        free(delaystring);
 
1476
        if(connect_to != NULL){
 
1477
          ret = setenv("CONNECT", connect_to, 1);
 
1478
          if(ret == -1){
 
1479
            perror_plus("setenv");
 
1480
            _exit(EX_OSERR);
 
1481
          }
 
1482
        }
1476
1483
        if(execl(fullname, direntry->d_name, mode, NULL) == -1){
1477
1484
          perror_plus("execl");
1478
1485
          _exit(EXIT_FAILURE);
1601
1608
        .group = 2 },
1602
1609
      { .name = "retry", .key = 132,
1603
1610
        .arg = "SECONDS",
1604
 
        .doc = "Retry interval used when denied by the mandos server",
 
1611
        .doc = "Retry interval used when denied by the Mandos server",
1605
1612
        .group = 2 },
1606
1613
      { .name = "network-hook-dir", .key = 133,
1607
1614
        .arg = "DIR",