/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-12 22:02:33 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090112220233-lawxo4uvyzb38u1f
* README (The Plugin System): Removed redundant text about options and
                              files for the plugins, this is now
                              documented in the manuals for the
                              plugins.

* plugins.d/mandos-client.c (main): Remove comment which was copied
                                    from another program by mistake.
                                    Use "sscanf" instead of "strtol"
                                    to parse numbers; this uses the
                                    correct type instead of casting.
                                    Don't report errors when removing
                                    temporary directory if directory
                                    is already gone.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
#include <stddef.h>             /* NULL */
32
32
#include <stdlib.h>             /* getenv() */
33
33
#include <stdio.h>              /* asprintf(), perror() */
34
 
#include <stdlib.h>             /* EXIT_FAILURE, free(),
 
34
#include <stdlib.h>             /* EXIT_FAILURE, free(), strtoul(),
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, strtoimax() */
40
39
#include <sys/stat.h>           /* struct stat, lstat(), S_ISLNK */
41
40
#include <iso646.h>             /* not, or, and */
42
41
#include <unistd.h>             /* readlink(), fork(), execl(),
48
47
                                   WEXITSTATUS() */
49
48
 
50
49
sig_atomic_t interrupted_by_signal = 0;
51
 
int signal_received;
52
50
 
53
 
static void termination_handler(int signum){
54
 
  if(interrupted_by_signal){
55
 
    return;
56
 
  }
 
51
static void termination_handler(__attribute__((unused))int signum){
57
52
  interrupted_by_signal = 1;
58
 
  signal_received = signum;
59
53
}
60
54
 
61
55
int main(__attribute__((unused))int argc,
103
97
    for(struct dirent *proc_ent = readdir(proc_dir);
104
98
        proc_ent != NULL;
105
99
        proc_ent = readdir(proc_dir)){
106
 
      pid_t pid;
107
 
      {
108
 
        intmax_t tmpmax;
109
 
        char *tmp;
110
 
        errno = 0;
111
 
        tmpmax = strtoimax(proc_ent->d_name, &tmp, 10);
112
 
        if(errno != 0 or tmp == proc_ent->d_name or *tmp != '\0'
113
 
           or tmpmax != (pid_t)tmpmax){
114
 
          /* Not a process */
115
 
          continue;
116
 
        }
117
 
        pid = (pid_t)tmpmax;
 
100
      pid_t pid = (pid_t) strtoul(proc_ent->d_name, NULL, 10);
 
101
      if(pid == 0){
 
102
        /* Not a process */
 
103
        continue;
118
104
      }
119
105
      /* Find the executable name by doing readlink() on the
120
106
         /proc/<pid>/exe link */
175
161
                     .sa_flags = 0 };
176
162
    sigemptyset(&new_action.sa_mask);
177
163
    sigaddset(&new_action.sa_mask, SIGINT);
178
 
    if(ret == -1){
179
 
      perror("sigaddset");
180
 
      free(prompt);
181
 
      return EXIT_FAILURE;
182
 
    }
183
164
    sigaddset(&new_action.sa_mask, SIGHUP);
184
 
    if(ret == -1){
185
 
      perror("sigaddset");
186
 
      free(prompt);
187
 
      return EXIT_FAILURE;
188
 
    }
189
165
    sigaddset(&new_action.sa_mask, SIGTERM);
190
 
    if(ret == -1){
191
 
      perror("sigaddset");
192
 
      free(prompt);
193
 
      return EXIT_FAILURE;
194
 
    }
195
166
    ret = sigaction(SIGINT, NULL, &old_action);
196
167
    if(ret == -1){
197
168
      perror("sigaction");
296
267
    /* Child; will become new splashy process */
297
268
    
298
269
    /* Make the effective user ID (root) the only user ID instead of
299
 
       the real user ID (_mandos) */
 
270
       the real user ID (mandos) */
300
271
    ret = setuid(geteuid());
301
272
    if(ret == -1){
302
273
      perror("setuid");