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

More consistent terminology: Clients are no longer "invalid" - they
are "disabled".  All code and documentation changed to reflect this.

D=Bus API change: The "properties" argument was removed from the
"ClientAdded" signal on interface "se.bsnet.fukt.Mandos".  All code in
both "mandos" and "mandos-monitor" changed to reflect this.

* mandos: Replaced "with closing(F)" with simply "with F" in all
          places where F is a file object.
  (Client.still_valid): Removed.  All callers changed to look at
                        "Client.enabled" instead.
  (dbus_service_property): Check for unsupported signatures with the
                           "byte_arrays" option.
  (DBusObjectWithProperties.Set): - '' -
  (ClientHandler.handle): Use the reverse pipe to receive the
                          "Client.enabled" attribute instead of the
                          now-removed "Client.still_valid()" method.
  (ForkingMixInWithPipe): Renamed to "ForkingMixInWithPipes" (all
                          users changed).  Now also create a reverse
                          pipe for sending data to the child process.
  (ForkingMixInWithPipes.add_pipe): Now takes two pipe fd's as
                                    arguments.  All callers changed.
  (IPv6_TCPServer.handle_ipc): Take an additional "reply_fd" argument
                               (all callers changed).  Close the reply
                               pipe when the child data pipe is
                               closed.  New "GETATTR" IPC method; will
                               pickle client attribute and send it
                               over the reply pipe FD.
  (MandosDBusService.ClientAdded): Removed "properties" argument.  All
                                   emitters changed.
* mandos-clients.conf.xml (DESCRIPTION, OPTIONS): Use
                                                  "enabled/disabled"
                                                  terminology.
* mandos-ctl: Option "--is-valid" renamed to "--is-enabled".
* mandos-monitor: Enable user locale.  Try to log exceptions.
  (MandosClientPropertyCache.__init__): Removed "properties" argument.
                                        All callers changed.
  (UserInterface.add_new_client): Remove "properties" argument.  All
                                  callers changed.  Supply "logger"
                                  argument to MandosClientWidget().
  (UserInterface.add_client): New "logger" argument.  All callers
                              changed.
* mandos.xml (BUGS, SECURITY/CLIENTS): Use "enabled/disabled"
                                       terminology.

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
                                   STDOUT_FILENO, _exit(),
44
44
                                   pause() */
45
45
#include <string.h>             /* memcmp() */
46
 
#include <errno.h>              /* errno */
 
46
#include <errno.h>              /* errno, EACCES, ENOTDIR, ELOOP,
 
47
                                   ENOENT, ENAMETOOLONG, EMFILE,
 
48
                                   ENFILE, ENOMEM, ENOEXEC, EINVAL,
 
49
                                   E2BIG, EFAULT, EIO, ETXTBSY,
 
50
                                   EISDIR, ELIBBAD, EPERM, EINTR,
 
51
                                   ECHILD */
47
52
#include <sys/wait.h>           /* waitpid(), WIFEXITED(),
48
53
                                   WEXITSTATUS() */
49
 
 
50
54
#include <sysexits.h>           /* EX_OSERR, EX_OSFILE,
51
55
                                   EX_UNAVAILABLE */
52
56
 
288
292
    if(not interrupted_by_signal){
289
293
      const char splashy_command[] = "/sbin/splashy_update";
290
294
      execl(splashy_command, splashy_command, prompt, (char *)NULL);
 
295
      int e = errno;
291
296
      perror("execl");
 
297
      switch(e){
 
298
      case EACCES:
 
299
      case ENOENT:
 
300
      case ENOEXEC:
 
301
      case EINVAL:
 
302
        _exit(EX_UNAVAILABLE);
 
303
      case ENAMETOOLONG:
 
304
      case E2BIG:
 
305
      case ENOMEM:
 
306
      case EFAULT:
 
307
      case EIO:
 
308
      case EMFILE:
 
309
      case ENFILE:
 
310
      case ETXTBSY:
 
311
      default:
 
312
        _exit(EX_OSERR);
 
313
      case ENOTDIR:
 
314
      case ELOOP:
 
315
      case EISDIR:
 
316
      case ELIBBAD:
 
317
      case EPERM:
 
318
        _exit(EX_OSFILE);
 
319
      }
292
320
    }
293
321
    free(prompt);
294
322
    _exit(EXIT_FAILURE);