← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to security/keys/keyctl.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/keys/keyctl.c
860
860
        /* otherwise specify the destination keyring recorded in the
861
861
         * authorisation key (any KEY_SPEC_*_KEYRING) */
862
862
        if (ringid >= KEY_SPEC_REQUESTOR_KEYRING) {
863
 
                *_dest_keyring = key_get(rka->dest_keyring);
 
863
                *_dest_keyring = rka->dest_keyring;
864
864
                return 0;
865
865
        }
866
866