/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/passprompt.c

  • Committer: Teddy Hogeborn
  • Date: 2008-07-29 03:35:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080729033539-08zecoj3jwlkpjhw
* server.conf: New file.

* mandos-clients.conf: Renamed to clients.conf.

* Makefile (FORTIFY): New.
  (CFLAGS): Include $(FORTIFY).

* plugins.d/mandosclient.c (main): New "if_index" variable.  Bug fix:
                                   check if interface exists.  New
                                   "--connect" option.

* server.py (serviceInterface): Removed; replaced by
                                "AvahiService.interface".  All users
                                changed.
  (AvahiError, AvahiServiceError, AvahiGroupError): New exception
                                                    classes.
  (AvahiService): New class.
  (serviceName): Removed; replaced by "AvahiService.name".  All users
                 changed.
  (serviceType): Removed; replaced by "AvahiService.type".  All users
                 changed.
  (servicePort): Removed; replaced by "AvahiService.port".  All users
                 changed.
  (serviceTXT): Removed; replaced by "AvahiService.TXT".  All users
                changed.
  (domain): Removed; replaced by "AvahiService.domain".  All users
            changed.
  (host): Removed; replaced by "AvahiService.host".  All users
          changed.
  (rename_count): Removed; replaced by "AvahiService.rename_count" and
                 "AvahiService.max_renames".  All users changed.
  (Client.__init__): If no secret or secfile, raise TypeError instead
                     of RuntimeError.
  (Client.last_seen): Renamed to "Client.last_checked_ok".  All users
                      changed.
  (Client.stop, Client.stop_checker): Use "getattr" with default value
                                      instead of "hasattr".
  (Client.still_valid): Removed "now" argument.
  (Client.handle): Separate the "no client found" and "client invalid"
                   cases for clearer code.
  (IPv6_TCPServer.__init__): "options" argument replaced by
                             "settings".  All callers changed.
  (IPv6_TCPServer.options): Replaced by "IPv6_TCPServer.settings".
                            All users changed.
  (IPv6_TCPServer.server_bind): Use getattr instead of hasattr.
  (add_service): Removed; replaced by "AvahiService.add".  All callers
                 changed.
  (remove_service): Removed; replaced by "AvahiService.remove".  All
                    callers changed.
  (entry_group_state_changed): On entry group collision, call the new
                               AvahiService.rename method.  Raise
                               AvahiGroupError on group error.
  (if_nametoindex): Use ctypes.utils.find_library to locate the C
                    library.  Cache the result.  Loop on EINTR.
  (daemon): Use os.path.devnull to locate "/dev/null".
  (killme): Removed.  All callers changed to do "sys.exit()" instead,
            except where stated otherwise.
  (main): Removed "exitstatus".  Removed all default values from all
          non-bool options.  New option "--configdir".  New variables
          "server_defaults" and "server_settings", read from
          "%(configdir)s/server.conf".  Let any supplied command line
          options override server settings.   Variable "defaults"
          renamed to "client_defaults", which is read from
          "clients.conf" instead of "mandos-clients.conf".  New global
          AvahiService object "service" replaces old global variables.
          Catch AvahiError and exit with error if caught.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/passprompt.c
49
49
volatile bool quit_now = false;
50
50
bool debug = false;
51
51
 
52
 
static void termination_handler(__attribute__((unused))int signum){
 
52
void termination_handler(__attribute__((unused))int signum){
53
53
  quit_now = true;
54
54
}
55
55
 
102
102
  
103
103
  sigemptyset(&new_action.sa_mask);
104
104
  sigaddset(&new_action.sa_mask, SIGINT);
 
105
  sigaddset(&new_action.sa_mask, SIGQUIT);
105
106
  sigaddset(&new_action.sa_mask, SIGHUP);
106
107
  sigaddset(&new_action.sa_mask, SIGTERM);
107
108
  sigaction(SIGINT, NULL, &old_action);
108
109
  if (old_action.sa_handler != SIG_IGN)
109
110
    sigaction(SIGINT, &new_action, NULL);
 
111
  sigaction(SIGQUIT, NULL, &old_action);
 
112
  if (old_action.sa_handler != SIG_IGN)
 
113
    sigaction(SIGQUIT, &new_action, NULL);
110
114
  sigaction(SIGHUP, NULL, &old_action);
111
115
  if (old_action.sa_handler != SIG_IGN)
112
116
    sigaction(SIGHUP, &new_action, NULL);
146
150
      status = EXIT_SUCCESS;
147
151
      break;
148
152
    }
 
153
    // ret == 0 makes no other sence than to retry to read from stdin
149
154
    if (ret < 0){
150
155
      if (errno != EINTR and not feof(stdin)){
151
156
        perror("getline");
153
158
        break;
154
159
      }
155
160
    }
156
 
    /* if(ret == 0), then the only sensible thing to do is to retry to
157
 
       read from stdin */
158
161
    fputc('\n', stderr);
159
162
  }
160
 
  
 
163
 
161
164
  if (debug){
162
165
    fprintf(stderr, "Restoring terminal attributes\n");
163
166
  }
164
167
  if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_old) != 0){
165
168
    perror("tcsetattr+echo");
166
169
  }
167
 
  
 
170
 
168
171
  if (debug){
169
172
    fprintf(stderr, "%s is exiting\n", argv[0]);
170
173
  }