← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/softoken/sftkpwd.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-06-16 13:23:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090616132347-311ysb8oep74b98y
Tags: 3.12.3-0ubuntu1
https://launchpad.net/bugs/387751
* new upstream release 3.12.3 RTM (NSS_3_12_3_RTM) (LP: #387751)
* adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
* needs nspr >= 4.7.4
  - update debian/control
* update 85_security_load.patch to latest debian version
  - update debian/patches/85_security_load.patch
* add new symbols for 3.12.3
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/softoken/sftkpwd.c
66
66
#include "prsystem.h"
67
67
#include "lgglue.h"
68
68
#include "secerr.h"
69
 
 
 
69
#include "softoken.h"
70
70
  
71
71
/******************************************************************
72
72
 * 
540
540
    }
541
541
 
542
542
    /* an atomic pointer set would be nice */
543
 
    PZ_Lock(keydb->passwordLock);
 
543
    SKIP_AFTER_FORK(PZ_Lock(keydb->passwordLock));
544
544
    data = keydb->passwordKey.data;
545
545
    len = keydb->passwordKey.len;
546
546
    keydb->passwordKey.data = passKey->data;
547
547
    keydb->passwordKey.len = passKey->len;
548
548
    passKey->data = data;
549
549
    passKey->len = len;
550
 
    PZ_Unlock(keydb->passwordLock);
 
550
    SKIP_AFTER_FORK(PZ_Unlock(keydb->passwordLock));
551
551
}
552
552
 
553
553
/*
852
852
        sftkdb_switchKeys(keydb, &key);
853
853
 
854
854
        /* we need to update, do it now */
855
 
        if (keydb->update) {
 
855
        if (((keydb->db->sdb_flags & SDB_RDONLY) == 0) && keydb->update) {
856
856
            /* update the peer certdb if it exists */
857
857
            if (keydb->peerDB) {
858
858
                sftkdb_Update(keydb->peerDB, &key);
1281
1281
}
1282
1282
 
1283
1283
/*
1284
 
 * loose our cached password
 
1284
 * lose our cached password
1285
1285
 */
1286
1286
SECStatus
1287
1287
sftkdb_ClearPassword(SFTKDBHandle *keydb)