Print this page
5218 posix definition of NULL
correct unistd.h and iso/stddef_iso.h
update gate source affected

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c
          +++ new/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c
↓ open down ↓ 724 lines elided ↑ open up ↑
 725  725          {SADB_IDENTTYPE_USER_FQDN,      "mailbox"},
 726  726          {SADB_X_IDENTTYPE_DN,           "dn"},
 727  727          {SADB_X_IDENTTYPE_DN,           "asn1dn"},
 728  728          {SADB_X_IDENTTYPE_GN,           "gn"},
 729  729          {SADB_X_IDENTTYPE_GN,           "asn1gn"},
 730  730          {SADB_X_IDENTTYPE_ADDR_RANGE,   "ipv4-range"},
 731  731          {SADB_X_IDENTTYPE_ADDR_RANGE,   "ipv6-range"},
 732  732          {SADB_X_IDENTTYPE_ADDR_RANGE,   "rangev4"},
 733  733          {SADB_X_IDENTTYPE_ADDR_RANGE,   "rangev6"},
 734  734          {SADB_X_IDENTTYPE_KEY_ID,       "keyid"},
 735      -        {NULL,  0}
      735 +        {0, NULL}
 736  736  };
 737  737  
 738  738  static int
 739  739  parse_idtype(char *type, uint16_t *idnum)
 740  740  {
 741  741          keywdtab_t      *idp;
 742  742  
 743  743          if (type == NULL)
 744  744                  return (-1);
 745  745  
↓ open down ↓ 147 lines elided ↑ open up ↑
 893  893  #define PSFLD_MODE      5
 894  894  #define PSFLD_KEY       6
 895  895  
 896  896  static keywdtab_t       psfldtypes[] = {
 897  897          {PSFLD_LOCID,           "localid"},
 898  898          {PSFLD_LOCIDTYPE,       "localidtype"},
 899  899          {PSFLD_REMID,           "remoteid"},
 900  900          {PSFLD_REMIDTYPE,       "remoteidtype"},
 901  901          {PSFLD_MODE,            "ike_mode"},
 902  902          {PSFLD_KEY,             "key"},
 903      -        {NULL,  0}
      903 +        {0, NULL}
 904  904  };
 905  905  
 906  906  static int
 907  907  parse_psfldid(char *type, uint16_t *idnum)
 908  908  {
 909  909          keywdtab_t      *pfp;
 910  910  
 911  911          if (type == NULL)
 912  912                  return (-1);
 913  913  
↓ open down ↓ 5 lines elided ↑ open up ↑
 919  919                  }
 920  920          }
 921  921  
 922  922          return (-1);
 923  923  }
 924  924  
 925  925  static keywdtab_t       ikemodes[] = {
 926  926          {IKE_XCHG_IDENTITY_PROTECT,     "main"},
 927  927          {IKE_XCHG_AGGRESSIVE,           "aggressive"},
 928  928          {IKE_XCHG_IP_AND_AGGR,          "both"},
 929      -        {NULL,  0}
      929 +        {0, NULL}
 930  930  };
 931  931  
 932  932  static int
 933  933  parse_ikmtype(char *mode, uint16_t *modenum)
 934  934  {
 935  935          keywdtab_t      *ikmp;
 936  936  
 937  937          if (mode == NULL)
 938  938                  return (-1);
 939  939  
↓ open down ↓ 2398 lines elided ↑ open up ↑
3338 3338          case IKE_SVC_DEL_PIN:
3339 3339                  do_setdel_pin(cmd, argc, argv);
3340 3340                  break;
3341 3341          case IKE_SVC_DUMP_P1S:
3342 3342          case IKE_SVC_DUMP_RULES:
3343 3343          case IKE_SVC_DUMP_GROUPS:
3344 3344          case IKE_SVC_DUMP_ENCRALGS:
3345 3345          case IKE_SVC_DUMP_AUTHALGS:
3346 3346          case IKE_SVC_DUMP_PS:
3347 3347          case IKE_SVC_DUMP_CERTCACHE:
3348      -                if (argc != NULL) {
     3348 +                if (argc != 0) {
3349 3349                          print_dump_help();
3350 3350                          break;
3351 3351                  }
3352 3352                  do_dump(cmd);
3353 3353                  break;
3354 3354          case IKE_SVC_GET_P1:
3355 3355          case IKE_SVC_GET_RULE:
3356 3356          case IKE_SVC_GET_PS:
3357 3357          case IKE_SVC_DEL_P1:
3358 3358          case IKE_SVC_DEL_RULE:
↓ open down ↓ 113 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX