diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/ChangeLog | 5 | ||||
| -rw-r--r-- | util/secmem.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 8be8f3fb8..8aee8a72b 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2000-10-16 Werner Koch <[email protected]> + + * secmem.c (lock_pool): Fixed error checking for Linux. + By James Troup. + Thu Sep 14 14:20:38 CEST 2000 Werner Koch <[email protected]> * miscutil.c (answer_is_yes_no_quit): Swapped order of yes/no test diff --git a/util/secmem.c b/util/secmem.c index 308b6bb46..1420597e8 100644 --- a/util/secmem.c +++ b/util/secmem.c @@ -100,6 +100,9 @@ lock_pool( void *p, size_t n ) #ifdef ENOSYS /* Some SCOs return this (function not implemented) */ && errno != ENOSYS #endif + #ifdef ENOMEM /* Linux can return this */ + && errno != ENOMEM + #endif ) log_error("can't lock memory: %s\n", strerror(err)); show_warning = 1; @@ -142,6 +145,9 @@ lock_pool( void *p, size_t n ) #ifdef ENOSYS /* Some SCOs return this (function not implemented) */ && errno != ENOSYS #endif + #ifdef ENOMEM /* Linux can return this */ + && errno != ENOMEM + #endif ) log_error("can't lock memory: %s\n", strerror(err)); show_warning = 1; |