Fix #ifdefs when --disable-crypt

This commit is contained in:
Kurt Zeilenga 2000-05-10 23:26:42 +00:00
parent 4efcc974a5
commit 3553f9aab6

View File

@ -104,15 +104,20 @@ static int chk_kerberos(
const struct berval *cred ); const struct berval *cred );
#endif #endif
#ifdef SLAPD_CRYPT
static int chk_crypt( static int chk_crypt(
const struct pw_scheme *scheme, const struct pw_scheme *scheme,
const struct berval *passwd, const struct berval *passwd,
const struct berval *cred ); const struct berval *cred );
#if defined( HAVE_GETSPNAM ) \
|| ( defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD ) )
static int chk_unix( static int chk_unix(
const struct pw_scheme *scheme, const struct pw_scheme *scheme,
const struct berval *passwd, const struct berval *passwd,
const struct berval *cred ); const struct berval *cred );
#endif
#endif
/* password hash routines */ /* password hash routines */
@ -132,9 +137,11 @@ static struct berval *hash_md5(
const struct pw_scheme *scheme, const struct pw_scheme *scheme,
const struct berval *passwd ); const struct berval *passwd );
#ifdef SLAPD_CRYPT
static struct berval *hash_crypt( static struct berval *hash_crypt(
const struct pw_scheme *scheme, const struct pw_scheme *scheme,
const struct berval *passwd ); const struct berval *passwd );
#endif
static const struct pw_scheme pw_schemes[] = static const struct pw_scheme pw_schemes[] =
@ -155,11 +162,11 @@ static const struct pw_scheme pw_schemes[] =
#ifdef SLAPD_CRYPT #ifdef SLAPD_CRYPT
{ {sizeof("{CRYPT}")-1, "{CRYPT}"}, chk_crypt, hash_crypt }, { {sizeof("{CRYPT}")-1, "{CRYPT}"}, chk_crypt, hash_crypt },
#endif
# if defined( HAVE_GETSPNAM ) \ # if defined( HAVE_GETSPNAM ) \
|| ( defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD ) ) || ( defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD ) )
{ {sizeof("{UNIX}")-1, "{UNIX}"}, chk_unix, NULL }, { {sizeof("{UNIX}")-1, "{UNIX}"}, chk_unix, NULL },
# endif # endif
#endif
#ifdef SLAPD_CLEARTEXT #ifdef SLAPD_CLEARTEXT
/* psuedo scheme */ /* psuedo scheme */