diff options
| author | Kai Engert <kaie@kuix.de> | 2016-04-06 18:02:27 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2016-04-06 18:02:27 +0200 |
| commit | ac96676c2eed3daaf856758459c9965b6e16a611 (patch) | |
| tree | 50b67be5ea74d7f61c01c23e26faba9b5c787ad0 | |
| parent | 743fc16a3b94bd9ba1e83c3699c1e2e94f7ff30b (diff) | |
| download | nss-hg-ac96676c2eed3daaf856758459c9965b6e16a611.tar.gz | |
Backed out changeset c719ec548096, as it causes Android regressions in Firefox test suite
| -rw-r--r-- | lib/softoken/sdb.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/softoken/sdb.c b/lib/softoken/sdb.c index 0304070e7..85da23bfe 100644 --- a/lib/softoken/sdb.c +++ b/lib/softoken/sdb.c @@ -411,7 +411,7 @@ sdb_measureAccess(const char *directory) * temp remains unchanged during our loop. */ PR_snprintf(tempStartOfFilename, maxFileNameLen, ".%lu%s", (PRUint32)(time+i), doesntExistName); - PR_Access(temp, PR_ACCESS_EXISTS); + PR_Access(temp,PR_ACCESS_EXISTS); next = PR_IntervalNow(); delta = next - time; if (delta >= duration) @@ -1730,15 +1730,11 @@ sdb_init(char *dbname, char *table, sdbDataType type, int *inUpdate, error = sdb_mapSQLError(type, sqlerr); goto loser; } - - /* - * SQL created the file, but it doesn't set appropriate modes for - * a database. - * - * NO NSPR call for chmod? :( - */ - if (create && chmod(dbname, 0600) != 0) { - goto loser; + /* sql created the file, but it doesn't set appropriate modes for + * a database */ + if (create) { + /* NO NSPR call for this? :( */ + chmod (dbname, 0600); } if (flags != SDB_RDONLY) { |