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

  • Committer: Teddy Hogeborn
  • Date: 2009-01-23 23:17:42 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090123231742-joje60549e3qagy0
* mandos (peer_certificate): Handle NULL pointer from
                             "gnutls_certificate_get_peers" slightly
                             better.
  (TCP_handler.handle): Added some extra debug output.

  (MandosServer.GetAllClients,
  MandosServer.GetAllClientsWithProperties,
  MandosServer.RemoveClient): Added doc string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
                                   SIG_IGN, kill(), SIGKILL */
31
31
#include <stddef.h>             /* NULL */
32
32
#include <stdlib.h>             /* getenv() */
33
 
#include <stdio.h>              /* asprintf(), perror() */
34
 
#include <stdlib.h>             /* EXIT_FAILURE, free(), strtoul(),
 
33
#include <stdio.h>              /* asprintf(), perror(), sscanf() */
 
34
#include <stdlib.h>             /* EXIT_FAILURE, free(),
35
35
                                   EXIT_SUCCESS */
36
36
#include <sys/types.h>          /* pid_t, DIR, struct dirent,
37
37
                                   ssize_t */
38
38
#include <dirent.h>             /* opendir(), readdir(), closedir() */
 
39
#include <inttypes.h>           /* intmax_t, SCNdMAX */
39
40
#include <sys/stat.h>           /* struct stat, lstat(), S_ISLNK */
40
41
#include <iso646.h>             /* not, or, and */
41
42
#include <unistd.h>             /* readlink(), fork(), execl(),
97
98
    for(struct dirent *proc_ent = readdir(proc_dir);
98
99
        proc_ent != NULL;
99
100
        proc_ent = readdir(proc_dir)){
100
 
      pid_t pid = (pid_t) strtoul(proc_ent->d_name, NULL, 10);
101
 
      if(pid == 0){
102
 
        /* Not a process */
103
 
        continue;
 
101
      pid_t pid;
 
102
      {
 
103
        intmax_t tmpmax;
 
104
        int numchars;
 
105
        ret = sscanf(proc_ent->d_name, "%" SCNdMAX "%n", &tmpmax,
 
106
                     &numchars);
 
107
        if(ret < 1 or tmpmax != (pid_t)tmpmax
 
108
           or proc_ent->d_name[numchars] != '\0'){
 
109
          /* Not a process */
 
110
          continue;
 
111
        }
 
112
        pid = (pid_t)tmpmax;
104
113
      }
105
114
      /* Find the executable name by doing readlink() on the
106
115
         /proc/<pid>/exe link */
267
276
    /* Child; will become new splashy process */
268
277
    
269
278
    /* Make the effective user ID (root) the only user ID instead of
270
 
       the real user ID (mandos) */
 
279
       the real user ID (_mandos) */
271
280
    ret = setuid(geteuid());
272
281
    if(ret == -1){
273
282
      perror("setuid");