← Back to branch summary

~ubuntu-branches/ubuntu/lucid/wpasupplicant/lucid-updates

« back to all changes in this revision

Viewing changes to preauth.c

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2006-10-05 08:04:01 UTC
  • mfrom: (1.1.5 upstream) (3 etch)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20061005080401-r8lqlix4390yos7b
Tags: 0.5.5-2
http://bugs.debian.org/388316
* Update madwifi headers to latest SVN. (Closes: #388316)
* Remove failed attempt at action locking. [debian/functions.sh,
  debian/wpa_action.sh]
* Add hysteresis checking functions, to avoid "event loops" while
  using wpa-roam. [debian/functions.sh, debian/wpa_action.sh]
* Change of co-maintainer email address.
* Add ishex() function to functions.sh to determine wpa-psk value type in
  plaintext or hex. This effectively eliminates the need for the bogus and
  somewhat confusing wpa-passphrase contruct specific to our scripts and
  allows wpa-psk to work with either a 8 to 63 character long plaintext
  string or 64 character long hex string.
* Adjust README.modes to not refer to the redundant wpa-passphrase stuff.
* Add big fat NOTE about acceptable wpa-psk's to top of example gallery.
* Strip surrounding quotes from wpa-ssid if present, instead of just whining
  about them.
* Update email address in copyright blurb of functions.sh, ifupdown.sh and
  wpa_action.sh.  

Show diffs side-by-side

added added

removed removed

Lines of Context:
preauth.c
494
494
                           int verbose)
495
495
{
496
496
        char *pos = buf, *end = buf + buflen;
497
 
        int res;
 
497
        int res, ret;
498
498
 
499
499
        if (sm->preauth_eapol) {
500
 
                pos += snprintf(pos, end - pos, "Pre-authentication "
501
 
                                "EAPOL state machines:\n");
 
500
                ret = snprintf(pos, end - pos, "Pre-authentication "
 
501
                               "EAPOL state machines:\n");
 
502
                if (ret < 0 || ret >= end - pos)
 
503
                        return pos - buf;
 
504
                pos += ret;
502
505
                res = eapol_sm_get_status(sm->preauth_eapol,
503
506
                                          pos, end - pos, verbose);
504
507
                if (res >= 0)