Changeset db09424d in rtems


Ignore:
Timestamp:
Sep 8, 2008, 6:45:43 AM (11 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.9, master
Children:
e9858275
Parents:
b4dad28
Message:

Add missing initializers.

Location:
cpukit/pppd
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • cpukit/pppd/auth.c

    rb4dad28 rdb09424d  
    182182option_t auth_options[] = {
    183183    { "require-pap", o_bool, &lcp_wantoptions[0].neg_upap,
    184       "Require PAP authentication from peer", 1, &auth_required },
     184      "Require PAP authentication from peer", 1, &auth_required, 0, 0 },
    185185    { "+pap", o_bool, &lcp_wantoptions[0].neg_upap,
    186       "Require PAP authentication from peer", 1, &auth_required },
     186      "Require PAP authentication from peer", 1, &auth_required, 0, 0 },
    187187    { "refuse-pap", o_bool, &refuse_pap,
    188       "Don't agree to auth to peer with PAP", 1 },
     188      "Don't agree to auth to peer with PAP", 1, NULL, 0, 0 },
    189189    { "-pap", o_bool, &refuse_pap,
    190       "Don't allow PAP authentication with peer", 1 },
     190      "Don't allow PAP authentication with peer", 1, NULL, 0, 0 },
    191191    { "require-chap", o_bool, &lcp_wantoptions[0].neg_chap,
    192       "Require CHAP authentication from peer", 1, &auth_required },
     192      "Require CHAP authentication from peer", 1, &auth_required, 0, 0 },
    193193    { "+chap", o_bool, &lcp_wantoptions[0].neg_chap,
    194       "Require CHAP authentication from peer", 1, &auth_required },
     194      "Require CHAP authentication from peer", 1, &auth_required, 0, 0 },
    195195    { "refuse-chap", o_bool, &refuse_chap,
    196       "Don't agree to auth to peer with CHAP", 1 },
     196      "Don't agree to auth to peer with CHAP", 1, NULL, 0, 0 },
    197197    { "-chap", o_bool, &refuse_chap,
    198       "Don't allow CHAP authentication with peer", 1 },
     198      "Don't allow CHAP authentication with peer", 1, NULL, 0, 0 },
    199199    { "name", o_string, our_name,
    200200      "Set local name for authentication",
    201       OPT_PRIV|OPT_STATIC, NULL, MAXNAMELEN },
     201      OPT_PRIV|OPT_STATIC, NULL, MAXNAMELEN, 0 },
    202202    { "user", o_string, user,
    203       "Set name for auth with peer", OPT_STATIC, NULL, MAXNAMELEN },
     203      "Set name for auth with peer", OPT_STATIC, NULL, MAXNAMELEN, 0 },
    204204    { "usehostname", o_bool, &usehostname,
    205       "Must use hostname for authentication", 1 },
     205      "Must use hostname for authentication", 1, NULL, 0, 0 },
    206206    { "remotename", o_string, remote_name,
    207207      "Set remote name for authentication", OPT_STATIC,
    208       &explicit_remote, MAXNAMELEN },
     208      &explicit_remote, MAXNAMELEN, 0 },
    209209    { "auth", o_bool, &auth_required,
    210       "Require authentication from peer", 1 },
     210      "Require authentication from peer", 1, NULL, 0, 0 },
    211211    { "noauth", o_bool, &auth_required,
    212       "Don't require peer to authenticate", OPT_PRIV, &allow_any_ip },
     212      "Don't require peer to authenticate", OPT_PRIV, &allow_any_ip, 0, 0 },
    213213    {  "login", o_bool, &uselogin,
    214       "Use system password database for PAP", 1 },
     214      "Use system password database for PAP", 1, NULL, 0, 0 },
    215215    { "papcrypt", o_bool, &cryptpap,
    216       "PAP passwords are encrypted", 1 },
     216      "PAP passwords are encrypted", 1, NULL, 0, 0 },
    217217/* Removed for RTEMS PORT
    218218    { "+ua", o_special, setupapfile,
     
    221221    { "password", o_string, passwd,
    222222      "Password for authenticating us to the peer", OPT_STATIC,
    223       NULL, MAXSECRETLEN },
     223      NULL, MAXSECRETLEN, 0 },
    224224/* Removed for RTEMS_PORT
    225225    { "privgroup", o_special, privgroup,
     
    229229      OPT_PRIV },
    230230*/
    231     { NULL }
     231    { NULL, 0, NULL, NULL, 0,  NULL, 0, 0 }
    232232};
    233233
  • cpukit/pppd/ccp.c

    rb4dad28 rdb09424d  
    4646static option_t ccp_option_list[] = {
    4747    { "noccp", o_bool, &ccp_protent.enabled_flag,
    48       "Disable CCP negotiation" },
     48      "Disable CCP negotiation", 0, NULL, 0, 0 },
    4949    { "-ccp", o_bool, &ccp_protent.enabled_flag,
    50       "Disable CCP negotiation" },
     50      "Disable CCP negotiation", 0, NULL, 0, 0 },
    5151    { "bsdcomp", o_special, setbsdcomp,
    52       "Request BSD-Compress packet compression" },
     52      "Request BSD-Compress packet compression", 0, NULL, 0, 0 },
    5353    { "nobsdcomp", o_bool, &ccp_wantoptions[0].bsd_compress,
    5454      "don't allow BSD-Compress", OPT_A2COPY,
    55       &ccp_allowoptions[0].bsd_compress },
     55      &ccp_allowoptions[0].bsd_compress, 0, 0 },
    5656    { "-bsdcomp", o_bool, &ccp_wantoptions[0].bsd_compress,
    5757      "don't allow BSD-Compress", OPT_A2COPY,
    58       &ccp_allowoptions[0].bsd_compress },
     58      &ccp_allowoptions[0].bsd_compress, 0, 0 },
    5959    { "deflate", 1, setdeflate,
    60       "request Deflate compression" },
     60      "request Deflate compression", 0, NULL, 0, 0 },
    6161    { "nodeflate", o_bool, &ccp_wantoptions[0].deflate,
    6262      "don't allow Deflate compression", OPT_A2COPY,
    63       &ccp_allowoptions[0].deflate },
     63      &ccp_allowoptions[0].deflate, 0, 0 },
    6464    { "-deflate", o_bool, &ccp_wantoptions[0].deflate,
    6565      "don't allow Deflate compression", OPT_A2COPY,
    66       &ccp_allowoptions[0].deflate },
     66      &ccp_allowoptions[0].deflate, 0, 0 },
    6767    { "nodeflatedraft", o_bool, &ccp_wantoptions[0].deflate_draft,
    6868      "don't use draft deflate #", OPT_A2COPY,
    69       &ccp_allowoptions[0].deflate_draft },
     69      &ccp_allowoptions[0].deflate_draft, 0, 0 },
    7070    { "predictor1", o_bool, &ccp_wantoptions[0].predictor_1,
    71       "request Predictor-1", 1, &ccp_allowoptions[0].predictor_1 },
     71      "request Predictor-1", 1,
     72      &ccp_allowoptions[0].predictor_1, 0, 0 },
    7273    { "nopredictor1", o_bool, &ccp_wantoptions[0].predictor_1,
    7374      "don't allow Predictor-1", OPT_A2COPY,
    74       &ccp_allowoptions[0].predictor_1 },
     75      &ccp_allowoptions[0].predictor_1, 0, 0 },
    7576    { "-predictor1", o_bool, &ccp_wantoptions[0].predictor_1,
    7677      "don't allow Predictor-1", OPT_A2COPY,
    77       &ccp_allowoptions[0].predictor_1 },
    78 
    79     { NULL }
     78      &ccp_allowoptions[0].predictor_1, 0, 0 },
     79
     80    { NULL, 0, NULL, NULL, 0,  NULL, 0, 0 }
    8081};
    8182
  • cpukit/pppd/chap.c

    rb4dad28 rdb09424d  
    6060static option_t chap_option_list[] = {
    6161    { "chap-restart", o_int, &chap[0].timeouttime,
    62       "Set timeout for CHAP" },
     62      "Set timeout for CHAP", 0, NULL, 0, 0 },
    6363    { "chap-max-challenge", o_int, &chap[0].max_transmits,
    64       "Set max #xmits for challenge" },
     64      "Set max #xmits for challenge", 0, NULL, 0, 0 },
    6565    { "chap-interval", o_int, &chap[0].chal_interval,
    66       "Set interval for rechallenge" },
     66      "Set interval for rechallenge", 0, NULL, 0, 0 },
    6767#ifdef MSLANMAN
    6868    { "ms-lanman", o_bool, &ms_lanman,
    69       "Use LanMan passwd when using MS-CHAP", 1 },
     69      "Use LanMan passwd when using MS-CHAP", 1, NULL, 0, 0 },
    7070#endif
    71     { NULL }
     71    { NULL, 0, NULL, NULL, 0,  NULL, 0, 0 }
    7272};
    7373
  • cpukit/pppd/ipcp.c

    rb4dad28 rdb09424d  
    106106static option_t ipcp_option_list[] = {
    107107    { "noip", o_bool, &ipcp_protent.enabled_flag,
    108       "Disable IP and IPCP" },
     108      "Disable IP and IPCP", 0, NULL, 0, 0 },
    109109    { "-ip", o_bool, &ipcp_protent.enabled_flag,
    110       "Disable IP and IPCP" },
     110      "Disable IP and IPCP", 0, NULL, 0, 0 },
    111111    { "novj", o_bool, &ipcp_wantoptions[0].neg_vj,
    112       "Disable VJ compression", OPT_A2COPY, &ipcp_allowoptions[0].neg_vj },
     112      "Disable VJ compression", OPT_A2COPY,
     113      &ipcp_allowoptions[0].neg_vj, 0, 0 },
    113114    { "-vj", o_bool, &ipcp_wantoptions[0].neg_vj,
    114       "Disable VJ compression", OPT_A2COPY, &ipcp_allowoptions[0].neg_vj },
     115      "Disable VJ compression", OPT_A2COPY,
     116      &ipcp_allowoptions[0].neg_vj, 0, 0 },
    115117    { "novjccomp", o_bool, &ipcp_wantoptions[0].cflag,
    116118      "Disable VJ connection-ID compression", OPT_A2COPY,
    117       &ipcp_allowoptions[0].cflag },
     119      &ipcp_allowoptions[0].cflag, 0, 0 },
    118120    { "-vjccomp", o_bool, &ipcp_wantoptions[0].cflag,
    119121      "Disable VJ connection-ID compression", OPT_A2COPY,
    120       &ipcp_allowoptions[0].cflag },
     122      &ipcp_allowoptions[0].cflag, 0, 0 },
    121123    { "vj-max-slots", 1, setvjslots,
    122       "Set maximum VJ header slots" },
     124      "Set maximum VJ header slots", 0, NULL, 0, 0 },
    123125    { "ipcp-accept-local", o_bool, &ipcp_wantoptions[0].accept_local,
    124       "Accept peer's address for us", 1 },
     126      "Accept peer's address for us", 1, NULL, 0, 0 },
    125127    { "ipcp-accept-remote", o_bool, &ipcp_wantoptions[0].accept_remote,
    126       "Accept peer's address for it", 1 },
     128      "Accept peer's address for it", 1, NULL, 0, 0 },
    127129    { "ipparam", o_string, &ipparam,
    128       "Set ip script parameter" },
     130      "Set ip script parameter", 0, NULL, 0, 0 },
    129131    { "noipdefault", o_bool, &disable_defaultip,
    130       "Don't use name for default IP adrs", 1 },
     132      "Don't use name for default IP adrs", 1, NULL, 0, 0 },
    131133    { "ms-dns", 1, setdnsaddr,
    132       "DNS address for the peer's use" },
     134      "DNS address for the peer's use", 0, NULL, 0, 0 },
    133135    { "ms-wins", 1, setwinsaddr,
    134       "Nameserver for SMB over TCP/IP for peer" },
     136      "Nameserver for SMB over TCP/IP for peer", 0, NULL, 0, 0 },
    135137    { "ipcp-restart", o_int, &ipcp_fsm[0].timeouttime,
    136       "Set timeout for IPCP" },
     138      "Set timeout for IPCP", 0, NULL, 0, 0 },
    137139    { "ipcp-max-terminate", o_int, &ipcp_fsm[0].maxtermtransmits,
    138       "Set max #xmits for term-reqs" },
     140      "Set max #xmits for term-reqs", 0, NULL, 0, 0 },
    139141    { "ipcp-max-configure", o_int, &ipcp_fsm[0].maxconfreqtransmits,
    140       "Set max #xmits for conf-reqs" },
     142      "Set max #xmits for conf-reqs", 0, NULL, 0, 0 },
    141143    { "ipcp-max-failure", o_int, &ipcp_fsm[0].maxnakloops,
    142       "Set max #conf-naks for IPCP" },
     144      "Set max #conf-naks for IPCP", 0, NULL, 0, 0 },
    143145    { "defaultroute", o_bool, &ipcp_wantoptions[0].default_route,
    144       "Add default route", OPT_ENABLE|1, &ipcp_allowoptions[0].default_route },
     146      "Add default route", OPT_ENABLE|1,
     147      &ipcp_allowoptions[0].default_route, 0, 0 },
    145148    { "nodefaultroute", o_bool, &ipcp_allowoptions[0].default_route,
    146149      "disable defaultroute option", OPT_A2COPY,
    147       &ipcp_wantoptions[0].default_route },
     150      &ipcp_wantoptions[0].default_route, 0, 0 },
    148151    { "-defaultroute", o_bool, &ipcp_allowoptions[0].default_route,
    149152      "disable defaultroute option", OPT_A2COPY,
    150       &ipcp_wantoptions[0].default_route },
     153      &ipcp_wantoptions[0].default_route, 0, 0 },
    151154    { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
    152       "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
     155      "Add proxy ARP entry", OPT_ENABLE|1,
     156      &ipcp_allowoptions[0].proxy_arp, 0, 0 },
    153157    { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
    154158      "disable proxyarp option", OPT_A2COPY,
    155       &ipcp_wantoptions[0].proxy_arp },
     159      &ipcp_wantoptions[0].proxy_arp, 0, 0 },
    156160    { "-proxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
    157161      "disable proxyarp option", OPT_A2COPY,
    158       &ipcp_wantoptions[0].proxy_arp },
     162      &ipcp_wantoptions[0].proxy_arp, 0, 0 },
    159163    { "usepeerdns", o_bool, &usepeerdns,
    160       "Ask peer for DNS address(es)", 1 },
    161     { NULL }
     164      "Ask peer for DNS address(es)", 1, NULL, 0, 0 },
     165    { NULL, 0, NULL, NULL, 0,  NULL, 0, 0 }
    162166};
    163167
  • cpukit/pppd/lcp.c

    rb4dad28 rdb09424d  
    4141static int      lcp_echo_interval = 0;  /* Interval between LCP echo-requests */
    4242static int      lcp_echo_fails = 0;     /* Tolerance to unanswered echo-requests */
    43 static bool     lax_recv = 0;           /* accept control chars in asyncmap */
     43static bool     lax_recv = false;       /* accept control chars in asyncmap */
    4444
    4545static int setescape(char **);
     
    4949    { "noaccomp", o_bool, &lcp_wantoptions[0].neg_accompression,
    5050      "Disable address/control compression",
    51       OPT_A2COPY, &lcp_allowoptions[0].neg_accompression },
     51      OPT_A2COPY, &lcp_allowoptions[0].neg_accompression, 0, 0 },
    5252    { "-ac", o_bool, &lcp_wantoptions[0].neg_accompression,
    5353      "Disable address/control compression",
    54       OPT_A2COPY, &lcp_allowoptions[0].neg_accompression },
     54      OPT_A2COPY, &lcp_allowoptions[0].neg_accompression, 0, 0 },
    5555    { "default-asyncmap", o_bool, &lcp_wantoptions[0].neg_asyncmap,
    5656      "Disable asyncmap negotiation",
    57       OPT_A2COPY, &lcp_allowoptions[0].neg_asyncmap },
     57      OPT_A2COPY, &lcp_allowoptions[0].neg_asyncmap, 0, 0 },
    5858    { "-am", o_bool, &lcp_wantoptions[0].neg_asyncmap,
    5959      "Disable asyncmap negotiation",
    60       OPT_A2COPY, &lcp_allowoptions[0].neg_asyncmap },
     60      OPT_A2COPY, &lcp_allowoptions[0].neg_asyncmap, 0, 0 },
    6161    { "asyncmap", o_uint32, &lcp_wantoptions[0].asyncmap,
    6262      "Set asyncmap (for received packets)",
    63       OPT_OR, &lcp_wantoptions[0].neg_asyncmap },
     63      OPT_OR, &lcp_wantoptions[0].neg_asyncmap, 0, 0 },
    6464    { "-as", o_uint32, &lcp_wantoptions[0].asyncmap,
    6565      "Set asyncmap (for received packets)",
    66       OPT_OR, &lcp_wantoptions[0].neg_asyncmap },
     66      OPT_OR, &lcp_wantoptions[0].neg_asyncmap, 0, 0 },
    6767    { "nomagic", o_bool, &lcp_wantoptions[0].neg_magicnumber,
    6868      "Disable magic number negotiation (looped-back line detection)",
    69       OPT_A2COPY, &lcp_allowoptions[0].neg_magicnumber },
     69      OPT_A2COPY, &lcp_allowoptions[0].neg_magicnumber, 0, 0 },
    7070    { "-mn", o_bool, &lcp_wantoptions[0].neg_magicnumber,
    7171      "Disable magic number negotiation (looped-back line detection)",
    72       OPT_A2COPY, &lcp_allowoptions[0].neg_magicnumber },
     72      OPT_A2COPY, &lcp_allowoptions[0].neg_magicnumber, 0, 0 },
    7373    { "default-mru", o_bool, &lcp_wantoptions[0].neg_mru,
    7474      "Disable MRU negotiation (use default 1500)",
    75       OPT_A2COPY, &lcp_allowoptions[0].neg_mru },
     75      OPT_A2COPY, &lcp_allowoptions[0].neg_mru, 0, 0 },
    7676    { "-mru", o_bool, &lcp_wantoptions[0].neg_mru,
    7777      "Disable MRU negotiation (use default 1500)",
    78       OPT_A2COPY, &lcp_allowoptions[0].neg_mru },
     78      OPT_A2COPY, &lcp_allowoptions[0].neg_mru, 0, 0 },
    7979    { "mru", o_int, &lcp_wantoptions[0].mru,
    8080      "Set MRU (maximum received packet size) for negotiation",
    81       0, &lcp_wantoptions[0].neg_mru },
     81      0, &lcp_wantoptions[0].neg_mru, 0, 0 },
    8282    { "nopcomp", o_bool, &lcp_wantoptions[0].neg_pcompression,
    8383      "Disable protocol field compression",
    84       OPT_A2COPY, &lcp_allowoptions[0].neg_pcompression },
     84      OPT_A2COPY, &lcp_allowoptions[0].neg_pcompression, 0, 0 },
    8585    { "-pc", o_bool, &lcp_wantoptions[0].neg_pcompression,
    8686      "Disable protocol field compression",
    87       OPT_A2COPY, &lcp_allowoptions[0].neg_pcompression },
     87      OPT_A2COPY, &lcp_allowoptions[0].neg_pcompression, 0, 0 },
    8888    { "-p", o_bool, &lcp_wantoptions[0].passive,
    89       "Set passive mode", 1 },
     89      "Set passive mode", 1, NULL, 0, 0 },
    9090    { "passive", o_bool, &lcp_wantoptions[0].passive,
    91       "Set passive mode", 1 },
     91      "Set passive mode", 1, NULL, 0, 0 },
    9292    { "silent", o_bool, &lcp_wantoptions[0].silent,
    93       "Set silent mode", 1 },
     93      "Set silent mode", 1, NULL, 0, 0 },
    9494    { "escape", o_special, setescape,
    95       "List of character codes to escape on transmission" },
     95      "List of character codes to escape on transmission", 0, NULL, 0, 0 },
    9696    { "lcp-echo-failure", o_int, &lcp_echo_fails,
    97       "Set number of consecutive echo failures to indicate link failure" },
     97      "Set number of consecutive echo failures to indicate link failure", 0, NULL, 0, 0 },
    9898    { "lcp-echo-interval", o_int, &lcp_echo_interval,
    99       "Set time in seconds between LCP echo requests" },
     99      "Set time in seconds between LCP echo requests", 0, NULL, 0, 0 },
    100100    { "lcp-restart", o_int, &lcp_fsm[0].timeouttime,
    101       "Set time in seconds between LCP retransmissions" },
     101      "Set time in seconds between LCP retransmissions", 0, NULL, 0, 0 },
    102102    { "lcp-max-terminate", o_int, &lcp_fsm[0].maxtermtransmits,
    103       "Set maximum number of LCP terminate-request transmissions" },
     103      "Set maximum number of LCP terminate-request transmissions", 0, NULL, 0, 0 },
    104104    { "lcp-max-configure", o_int, &lcp_fsm[0].maxconfreqtransmits,
    105       "Set maximum number of LCP configure-request transmissions" },
     105      "Set maximum number of LCP configure-request transmissions", 0, NULL, 0, 0 },
    106106    { "lcp-max-failure", o_int, &lcp_fsm[0].maxnakloops,
    107       "Set limit on number of LCP configure-naks" },
     107      "Set limit on number of LCP configure-naks", 0, NULL, 0, 0 },
    108108    { "receive-all", o_bool, &lax_recv,
    109       "Accept all received control characters", 1 },
    110     {NULL}
     109      "Accept all received control characters", 1, NULL, 0, 0 },
     110    {NULL, 0, NULL, NULL, 0,  NULL, 0, 0}
    111111};
    112112
  • cpukit/pppd/options.c

    rb4dad28 rdb09424d  
    163163option_t general_options[] = {
    164164    { "debug", o_int, &debug,
    165       "Increase debugging level", OPT_INC|OPT_NOARG|1 },
     165      "Increase debugging level", OPT_INC|OPT_NOARG|1, NULL, 0, 0 },
    166166    { "-d", o_int, &debug,
    167       "Increase debugging level", OPT_INC|OPT_NOARG|1 },
     167      "Increase debugging level", OPT_INC|OPT_NOARG|1, NULL, 0, 0 },
    168168    { "kdebug", o_int, &kdebugflag,
    169       "Set kernel driver debug level" },
     169      "Set kernel driver debug level", 0, NULL, 0, 0 },
    170170    { "nodetach", o_bool, &nodetach,
    171       "Don't detach from controlling tty", 1 },
     171      "Don't detach from controlling tty", 1, NULL, 0, 0 },
    172172    { "-detach", o_bool, &nodetach,
    173       "Don't detach from controlling tty", 1 },
     173      "Don't detach from controlling tty", 1, NULL, 0, 0 },
    174174    { "updetach", o_bool, &updetach,
    175       "Detach from controlling tty once link is up", 1 },
     175      "Detach from controlling tty once link is up", 1, NULL, 0, 0 },
    176176    { "holdoff", o_int, &holdoff,
    177       "Set time in seconds before retrying connection" },
     177      "Set time in seconds before retrying connection", 0, NULL, 0, 0 },
    178178    { "idle", o_int, &idle_time_limit,
    179       "Set time in seconds before disconnecting idle link" },
     179      "Set time in seconds before disconnecting idle link", 0, NULL, 0, 0 },
    180180    { "lock", o_bool, &lockflag,
    181       "Lock serial device with UUCP-style lock file", 1 },
     181      "Lock serial device with UUCP-style lock file", 1, NULL, 0, 0 },
    182182    { "-all", o_special_noarg, noopt,
    183       "Don't request/allow any LCP or IPCP options (useless)" },
     183      "Don't request/allow any LCP or IPCP options (useless)", 0, NULL, 0, 0 },
    184184    { "init", o_string, &initializer,
    185185      "A program to initialize the device",
    186       OPT_A2INFO | OPT_PRIVFIX, &initializer_info },
     186      OPT_A2INFO | OPT_PRIVFIX, &initializer_info, 0, 0 },
    187187    { "connect", o_string, &connect_script,
    188188      "A program to set up a connection",
    189       OPT_A2INFO | OPT_PRIVFIX, &connect_script_info },
     189      OPT_A2INFO | OPT_PRIVFIX, &connect_script_info, 0, 0 },
    190190    { "disconnect", o_string, &disconnect_script,
    191191      "Program to disconnect serial device",
    192       OPT_A2INFO | OPT_PRIVFIX, &disconnect_script_info },
     192      OPT_A2INFO | OPT_PRIVFIX, &disconnect_script_info, 0, 0 },
    193193    { "welcome", o_string, &welcomer,
    194194      "Script to welcome client",
    195       OPT_A2INFO | OPT_PRIVFIX, &welcomer_info },
     195      OPT_A2INFO | OPT_PRIVFIX, &welcomer_info, 0, 0 },
    196196    { "pty", o_string, &ptycommand,
    197197      "Script to run on pseudo-tty master side",
    198       OPT_A2INFO | OPT_PRIVFIX | OPT_DEVNAM, &ptycommand_info },
     198      OPT_A2INFO | OPT_PRIVFIX | OPT_DEVNAM, &ptycommand_info, 0, 0 },
    199199    { "notty", o_bool, &notty,
    200       "Input/output is not a tty", OPT_DEVNAM | 1 },
     200      "Input/output is not a tty", OPT_DEVNAM | 1, NULL, 0, 0 },
    201201    { "record", o_string, &record_file,
    202       "Record characters sent/received to file" },
     202      "Record characters sent/received to file", 0, NULL, 0, 0 },
    203203    { "maxconnect", o_int, &maxconnect,
    204       "Set connection time limit", OPT_LLIMIT|OPT_NOINCR|OPT_ZEROINF },
     204      "Set connection time limit", OPT_LLIMIT|OPT_NOINCR|OPT_ZEROINF, NULL, 0, 0 },
    205205    { "crtscts", o_int, &crtscts,
    206       "Set hardware (RTS/CTS) flow control", OPT_NOARG|OPT_VAL(1) },
     206      "Set hardware (RTS/CTS) flow control", OPT_NOARG|OPT_VAL(1), NULL, 0, 0 },
    207207    { "nocrtscts", o_int, &crtscts,
    208       "Disable hardware flow control", OPT_NOARG|OPT_VAL(-1) },
     208      "Disable hardware flow control", OPT_NOARG|OPT_VAL(-1), NULL, 0, 0 },
    209209    { "-crtscts", o_int, &crtscts,
    210       "Disable hardware flow control", OPT_NOARG|OPT_VAL(-1) },
     210      "Disable hardware flow control", OPT_NOARG|OPT_VAL(-1), NULL, 0, 0 },
    211211    { "cdtrcts", o_int, &crtscts,
    212       "Set alternate hardware (DTR/CTS) flow control", OPT_NOARG|OPT_VAL(2) },
     212      "Set alternate hardware (DTR/CTS) flow control", OPT_NOARG|OPT_VAL(2), NULL, 0, 0 },
    213213    { "nocdtrcts", o_int, &crtscts,
    214       "Disable hardware flow control", OPT_NOARG|OPT_VAL(-1) },
     214      "Disable hardware flow control", OPT_NOARG|OPT_VAL(-1), NULL, 0, 0 },
    215215    { "xonxoff", o_special_noarg, setxonxoff,
    216       "Set software (XON/XOFF) flow control" },
     216      "Set software (XON/XOFF) flow control", 0, NULL, 0, 0 },
    217217    { "domain", o_special, setdomain,
    218       "Add given domain name to hostname" },
     218      "Add given domain name to hostname", 0, NULL, 0, 0 },
    219219    { "mtu", o_int, &lcp_allowoptions[0].mru,
    220220      "Set our MTU", OPT_LIMITS, NULL, MAXMRU, MINMRU },
    221221    { "netmask", o_special, setnetmask,
    222       "set netmask" },
     222      "set netmask", 0, NULL, 0, 0 },
    223223    { "modem", o_bool, &modem,
    224       "Use modem control lines", 1 },
     224      "Use modem control lines", 1, NULL, 0, 0 },
    225225    { "local", o_bool, &modem,
    226       "Don't use modem control lines" },
     226      "Don't use modem control lines", 0, NULL, 0, 0 },
    227227    { "file", o_special, readfile,
    228       "Take options from a file", OPT_PREPASS },
     228      "Take options from a file", OPT_PREPASS, NULL, 0, 0 },
    229229    { "call", o_special, callfile,
    230       "Take options from a privileged file", OPT_PREPASS },
     230      "Take options from a privileged file", OPT_PREPASS, NULL, 0, 0 },
    231231    { "persist", o_bool, &persist,
    232       "Keep on reopening connection after close", 1 },
     232      "Keep on reopening connection after close", 1, NULL, 0, 0 },
    233233    { "nopersist", o_bool, &persist,
    234       "Turn off persist option" },
     234      "Turn off persist option", 0, NULL, 0, 0 },
    235235    { "demand", o_bool, &demand,
    236       "Dial on demand", OPT_INITONLY | 1, &persist },
     236      "Dial on demand", OPT_INITONLY | 1, &persist, 0, 0 },
    237237    { "sync", o_bool, &sync_serial,
    238       "Use synchronous HDLC serial encoding", 1 },
     238      "Use synchronous HDLC serial encoding", 1, NULL, 0, 0 },
    239239    { "logfd", o_int, &log_to_fd,
    240       "Send log messages to this file descriptor" },
     240      "Send log messages to this file descriptor", 0, NULL, 0, 0 },
    241241    { "logfile", o_special, setlogfile,
    242       "Append log messages to this file" },
     242      "Append log messages to this file", 0, NULL, 0, 0 },
    243243    { "nolog", o_int, &log_to_fd,
    244244      "Don't send log messages to any file",
    245       OPT_NOARG | OPT_VAL(-1) },
     245      OPT_NOARG | OPT_VAL(-1), NULL, 0, 0 },
    246246    { "nologfd", o_int, &log_to_fd,
    247247      "Don't send log messages to any file descriptor",
    248       OPT_NOARG | OPT_VAL(-1) },
     248      OPT_NOARG | OPT_VAL(-1), NULL, 0, 0 },
    249249    { "linkname", o_string, linkname,
    250250      "Set logical name for link",
    251       OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN },
     251      OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN, 0 },
    252252    { "maxfail", o_int, &maxfail,
    253       "Maximum number of unsuccessful connection attempts to allow" },
     253      "Maximum number of unsuccessful connection attempts to allow", 0, NULL, 0, 0 },
    254254    { "ktune", o_bool, &tune_kernel,
    255       "Alter kernel settings as necessary", 1 },
     255      "Alter kernel settings as necessary", 1, NULL, 0, 0 },
    256256    { "noktune", o_bool, &tune_kernel,
    257       "Don't alter kernel settings", 0 },
     257      "Don't alter kernel settings", 0, NULL, 0, 0 },
    258258    { "connect-delay", o_int, &connect_delay,
    259       "Maximum time (in ms) to wait after connect script finishes" },
     259      "Maximum time (in ms) to wait after connect script finishes", 0, NULL, 0, 0 },
    260260#ifdef PLUGIN
    261261    { "plugin", o_special, loadplugin,
    262       "Load a plug-in module into pppd", OPT_PRIV },
     262      "Load a plug-in module into pppd", OPT_PRIV, NULL, 0, 0 },
    263263#endif
    264264
    265265#ifdef PPP_FILTER
    266266    { "pdebug", o_int, &dflag,
    267       "libpcap debugging" },
     267      "libpcap debugging", 0, NULL, 0, 0 },
    268268    { "pass-filter", 1, setpassfilter,
    269       "set filter for packets to pass" },
     269      "set filter for packets to pass", 0, NULL, 0, 0 },
    270270    { "active-filter", 1, setactivefilter,
    271       "set filter for active pkts" },
     271      "set filter for active pkts", 0, NULL, 0, 0 },
    272272#endif
    273273
    274     { NULL }
     274    { NULL, 0, NULL, NULL, 0,  NULL, 0, 0 }
    275275};
    276276
  • cpukit/pppd/upap.c

    rb4dad28 rdb09424d  
    3232static const char rcsid[] = RCSID;
    3333
    34 static bool hide_password = 1;
     34static bool hide_password = true;
    3535
    3636/*
     
    3939static option_t pap_option_list[] = {
    4040    { "hide-password", o_bool, &hide_password,
    41       "Don't output passwords to log", 1 },
     41      "Don't output passwords to log", 1, NULL, 0, 0 },
    4242    { "show-password", o_bool, &hide_password,
    43       "Show password string in debug log messages", 0 },
     43      "Show password string in debug log messages", 0, NULL, 0, 0 },
    4444    { "pap-restart", o_int, &upap[0].us_timeouttime,
    45       "Set retransmit timeout for PAP" },
     45      "Set retransmit timeout for PAP", 0, NULL, 0, 0 },
    4646    { "pap-max-authreq", o_int, &upap[0].us_maxtransmits,
    47       "Set max number of transmissions for auth-reqs" },
     47      "Set max number of transmissions for auth-reqs", 0, NULL, 0, 0 },
    4848    { "pap-timeout", o_int, &upap[0].us_reqtimeout,
    49       "Set time limit for peer PAP authentication" },
    50     { NULL }
     49      "Set time limit for peer PAP authentication", 0, NULL, 0, 0 },
     50    { NULL, 0, NULL, NULL, 0, NULL, 0, 0 }
    5151};
    5252
Note: See TracChangeset for help on using the changeset viewer.