/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 plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2014-03-28 22:32:21 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 311.
  • Revision ID: teddy@recompile.se-20140328223221-w579qlvlex5if3dn
Fix location and format of signing key file.

* debian/upstream/signing-key.asc: Added.
* debian/upstream-signing-key.pgp: Removed.

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-2014 Teddy Hogeborn
13
 
 * Copyright © 2008-2014 Björn Påhlsson
 
12
 * Copyright © 2008-2013 Teddy Hogeborn
 
13
 * Copyright © 2008-2013 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
136
136
 
137
137
bool debug = false;
138
138
static const char mandos_protocol_version[] = "1";
139
 
const char *argp_program_version = "mandos-client " VERSION;
140
 
const char *argp_program_bug_address = "<mandos@recompile.se>";
 
139
const char * argp_program_version = "mandos-client " VERSION;
 
140
const char * argp_program_bug_address = "<mandos@recompile.se>";
141
141
static const char sys_class_net[] = "/sys/class/net";
142
142
char *connect_to = NULL;
143
143
const char *hookdir = HOOKDIR;
1715
1715
    
1716
1716
    /* Raise privileges */
1717
1717
    ret_errno = raise_privileges();
 
1718
    bool restore_loglevel = false;
1718
1719
    if(ret_errno != 0){
1719
1720
      perror_plus("Failed to raise privileges");
1720
1721
    }
1721
 
    
1722
1722
#ifdef __linux__
1723
1723
    int ret_linux;
1724
 
    bool restore_loglevel = false;
1725
1724
    if(ret_errno == 0){
1726
1725
      /* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO
1727
1726
         messages about the network interface to mess up the prompt */
1827
1826
    if(ret_errno != 0){
1828
1827
      perror_plus("Failed to raise privileges");
1829
1828
    }
1830
 
    
1831
1829
    int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1832
1830
    ioctl_errno = errno;
1833
1831
    
2562
2560
        }
2563
2561
      }
2564
2562
    }
2565
 
    
2566
2563
    ret_errno = lower_privileges_permanently();
2567
2564
    if(ret_errno != 0){
2568
2565
      perror_plus("Failed to lower privileges permanently");