aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-04-05 11:56:28 +0000
committerChristian Grothoff <christian@grothoff.org>2010-04-05 11:56:28 +0000
commite8cb6d674411db8633c8706afe7b62e53d8419b6 (patch)
tree8e36e44e1a0ab946b5d5dac6b46747da1bf04123
parente7d5eee1c2c47fd1ba94c6395cae9d4054da1afe (diff)
downloadgnunet-e8cb6d674411db8633c8706afe7b62e53d8419b6.tar.gz
gnunet-e8cb6d674411db8633c8706afe7b62e53d8419b6.zip
fix
-rw-r--r--src/util/crypto_rsa.c14
-rw-r--r--src/util/pseudonym.c5
2 files changed, 15 insertions, 4 deletions
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index 4a0a66b0a..f3bb04cd2 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -583,7 +583,19 @@ GNUNET_CRYPTO_rsa_key_create_from_file (const char *filename)
583 if (NULL == fd) 583 if (NULL == fd)
584 { 584 {
585 if (errno == EEXIST) 585 if (errno == EEXIST)
586 continue; 586 {
587 if (GNUNET_YES != GNUNET_DISK_file_test (filename))
588 {
589 /* must exist but not be accessible, fail for good! */
590 if (0 != ACCESS (filenae, R_OK))
591 GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
592 "access", filename);
593 else
594 GNUNET_break (0); /* what is going on!? */
595 return NULL;
596 }
597 continue;
598 }
587 GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, 599 GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
588 "open", filename); 600 "open", filename);
589 return NULL; 601 return NULL;
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c
index dfacbdcd8..fcef2e9f8 100644
--- a/src/util/pseudonym.c
+++ b/src/util/pseudonym.c
@@ -504,6 +504,7 @@ GNUNET_PSEUDONYM_list_all (const struct GNUNET_CONFIGURATION_Handle *cfg,
504 return ret; 504 return ret;
505} 505}
506 506
507
507/** 508/**
508 * Change the ranking of a pseudonym. 509 * Change the ranking of a pseudonym.
509 * 510 *
@@ -536,6 +537,7 @@ GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg,
536 return ranking; 537 return ranking;
537} 538}
538 539
540
539/** 541/**
540 * Insert metadata into existing MD record (passed as cls). 542 * Insert metadata into existing MD record (passed as cls).
541 * 543 *
@@ -609,7 +611,4 @@ GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg,
609} 611}
610 612
611 613
612
613
614
615/* end of pseudonym.c */ 614/* end of pseudonym.c */