Change pwquality_get_str_setting() to return error value.

2 files changed, 9 insertions, 8 deletions

diff --git a/src/pwquality.h b/src/pwquality.h
index e9e9b28..fcb379f 100644
--- a/src/pwquality.h
+++ b/src/pwquality.h
@@ -87,9 +87,9 @@ pwquality_set_str_value(pwquality_settings_t *pwq, int setting,
 int
 pwquality_get_int_value(pwquality_settings_t *pwq, int setting, int *value);
 
-/* Get value of a string setting, or NULL if setting unknown. */
-const char *
-pwquality_get_str_value(pwquality_settings_t *pwq, int setting);
+/* Get value of a string setting. */
+int
+pwquality_get_str_value(pwquality_settings_t *pwq, int setting, const char **value);
 
 /* Generate a random password of entropy_bits entropy and check it according to
  * the settings. */
diff --git a/src/settings.c b/src/settings.c
index dec35eb..6c42c19 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -301,16 +301,17 @@ pwquality_get_int_value(pwquality_settings_t *pwq, int setting, int *value)
 }
 
 /* get value of a string setting, or NULL if setting unknown */
-const char *
-pwquality_get_str_value(pwquality_settings_t *pwq, int setting)
+int
+pwquality_get_str_value(pwquality_settings_t *pwq, int setting, const char **value)
 {
         switch(setting) {
         case PWQ_SETTING_DICT_PATH:
-                return pwq->dict_path;
+                *value = pwq->dict_path;
+                break;
         default:
-                return NULL;
+                return PWQ_ERROR_NON_STR_SETTING;
         }
-
+        return 0;
 }
 
 /*