/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: 2016-06-27 20:21:50 UTC
  • Revision ID: teddy@recompile.se-20160627202150-ml201ilxwjf1g29w
mandos-ctl: Implement --dump-json option

* mandos-ctl (main): Implement --dump-json option
* mandos-ctl.xml (NAME, DESCRIPTION): Change description to the more
                                      accurate "control or query".
  (SYNOPSIS): Add required group around action options and add new
              "--dump-json" option.
  (OPTIONS): Document new "--dump-json" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
1237
1237
           with an explicit route added with the server's address.
1238
1238
           
1239
1239
           Avahi bug reference:
1240
 
           https://lists.freedesktop.org/archives/avahi/2010-February/001833.html
 
1240
           http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1241
1241
           https://bugs.debian.org/587961
1242
1242
        */
1243
1243
        if(debug){
1423
1423
                                               &decrypted_buffer, mc);
1424
1424
    if(decrypted_buffer_size >= 0){
1425
1425
      
1426
 
      clearerr(stdout);
1427
1426
      written = 0;
1428
1427
      while(written < (size_t) decrypted_buffer_size){
1429
1428
        if(quit_now){
1445
1444
        }
1446
1445
        written += (size_t)ret;
1447
1446
      }
1448
 
      ret = fflush(stdout);
1449
 
      if(ret != 0){
1450
 
        int e = errno;
1451
 
        if(debug){
1452
 
          fprintf_plus(stderr, "Error writing encrypted data: %s\n",
1453
 
                       strerror(errno));
1454
 
        }
1455
 
        errno = e;
1456
 
        goto mandos_end;
1457
 
      }
1458
1447
      retval = 0;
1459
1448
    }
1460
1449
  }
2496
2485
  
2497
2486
  {
2498
2487
    /* Work around Debian bug #633582:
2499
 
       <https://bugs.debian.org/633582> */
 
2488
       <http://bugs.debian.org/633582> */
2500
2489
    
2501
2490
    /* Re-raise privileges */
2502
2491
    ret = raise_privileges();