/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 plugin-runner.c

  • Committer: teddy at recompile
  • Date: 2011-12-31 13:25:58 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111231132558-z0dh7qgofgctmgri
* network-hooks.s/bridge: Don't use interface names directly; search
                          for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/bridge.conf (PORTS): Removed.
  (PORT_ADDRESSES): New.
* network-hooks.s/wireless: Don't use interface names directly; search
                            for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/wireless.conf: Specify address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
426
426
    errno = 0;
427
427
    switch(key){
428
428
      char *tmp;
429
 
      intmax_t tmp_id;
 
429
      intmax_t tmpmax;
430
430
    case 'g':                   /* --global-options */
431
431
      {
432
432
        char *plugin_option;
505
505
      /* This is already done by parse_opt_config_file() */
506
506
      break;
507
507
    case 130:                   /* --userid */
508
 
      tmp_id = strtoimax(arg, &tmp, 10);
 
508
      tmpmax = strtoimax(arg, &tmp, 10);
509
509
      if(errno != 0 or tmp == arg or *tmp != '\0'
510
 
         or tmp_id != (uid_t)tmp_id){
 
510
         or tmpmax != (uid_t)tmpmax){
511
511
        argp_error(state, "Bad user ID number: \"%s\", using %"
512
512
                   PRIdMAX, arg, (intmax_t)uid);
513
513
        break;
514
514
      }
515
 
      uid = (uid_t)tmp_id;
 
515
      uid = (uid_t)tmpmax;
516
516
      break;
517
517
    case 131:                   /* --groupid */
518
 
      tmp_id = strtoimax(arg, &tmp, 10);
 
518
      tmpmax = strtoimax(arg, &tmp, 10);
519
519
      if(errno != 0 or tmp == arg or *tmp != '\0'
520
 
         or tmp_id != (gid_t)tmp_id){
 
520
         or tmpmax != (gid_t)tmpmax){
521
521
        argp_error(state, "Bad group ID number: \"%s\", using %"
522
522
                   PRIdMAX, arg, (intmax_t)gid);
523
523
        break;
524
524
      }
525
 
      gid = (gid_t)tmp_id;
 
525
      gid = (gid_t)tmpmax;
526
526
      break;
527
527
    case 132:                   /* --debug */
528
528
      debug = true;