From 7d6c303951ccc0eae7dbb79c334a6bf7d99e5276 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Tue, 23 Nov 2010 17:43:23 +0100 Subject: [PATCH 1/2] Make string_to_shadowpw_days() public --- src/providers/ldap/ldap_auth.c | 33 --------------------------------- src/providers/ldap/ldap_common.c | 34 ++++++++++++++++++++++++++++++++++ src/providers/ldap/ldap_common.h | 2 ++ 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c index 57a549d..5a85fe9 100644 --- a/src/providers/ldap/ldap_auth.c +++ b/src/providers/ldap/ldap_auth.c @@ -232,39 +232,6 @@ static errno_t check_pwexpire_ldap(struct pam_data *pd, return EOK; } -static errno_t string_to_shadowpw_days(const char *s, long *d) -{ - long l; - char *endptr; - - if (s == NULL || *s == '\0') { - *d = -1; - return EOK; - } - - errno = 0; - l = strtol(s, &endptr, 10); - if (errno != 0) { - DEBUG(1, ("strtol failed [%d][%s].\n", errno, strerror(errno))); - return errno; - } - - if (*endptr != '\0') { - DEBUG(1, ("Input string [%s] is invalid.\n", s)); - return EINVAL; - } - - if (*d < -1) { - DEBUG(1, ("Input string contains not allowed negative value [%d].\n", - *d)); - return EINVAL; - } - - *d = l; - - return EOK; -} - static errno_t find_password_expiration_attributes(TALLOC_CTX *mem_ctx, const struct ldb_message *msg, struct dp_option *opts, diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index aa0bac6..d9d44c8 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -738,3 +738,37 @@ done: talloc_zfree(tmp_ctx); return ret; } + +errno_t string_to_shadowpw_days(const char *s, long *d) +{ + long l; + char *endptr; + + if (s == NULL || *s == '\0') { + *d = -1; + return EOK; + } + + errno = 0; + l = strtol(s, &endptr, 10); + if (errno != 0) { + DEBUG(1, ("strtol failed [%d][%s].\n", errno, strerror(errno))); + return errno; + } + + if (*endptr != '\0') { + DEBUG(1, ("Input string [%s] is invalid.\n", s)); + return EINVAL; + } + + if (*d < -1) { + DEBUG(1, ("Input string contains not allowed negative value [%d].\n", + *d)); + return EINVAL; + } + + *d = l; + + return EOK; +} + diff --git a/src/providers/ldap/ldap_common.h b/src/providers/ldap/ldap_common.h index 5c298d1..d24a983 100644 --- a/src/providers/ldap/ldap_common.h +++ b/src/providers/ldap/ldap_common.h @@ -143,4 +143,6 @@ int netgroup_get_recv(struct tevent_req *req, int *dp_error_out); /* setup child logging */ int setup_child(struct sdap_id_ctx *ctx); + +errno_t string_to_shadowpw_days(const char *s, long *d); #endif /* _LDAP_COMMON_H_ */ -- 1.7.3.2