From ec77fbdd713dcc79888a798e968d369f6ff0e933 Mon Sep 17 00:00:00 2001 From: Brian Feldman Date: Wed, 23 Aug 2000 03:45:57 +0000 Subject: Stick login_setcryptfmt() in its own file to make pulling in of -lcrypt only happen if truly necessary. --- libutil/login_cap.c | 13 ------------- libutil/login_crypt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 libutil/login_crypt.c diff --git a/libutil/login_cap.c b/libutil/login_cap.c index 7410380..b7528b9 100644 --- a/libutil/login_cap.c +++ b/libutil/login_cap.c @@ -798,16 +798,3 @@ login_getstyle(login_cap_t *lc, char *style, const char *auth) return lc->lc_style; } - -const char * -login_setcryptfmt(login_cap_t *lc, const char *def, const char *error) -{ - const char *cipher; - - cipher = login_getcapstr(lc, "passwd_format", def, NULL); - if (cipher == NULL) - return (error); - if (!crypt_set_format(cipher)) - return (error); - return (cipher); -} diff --git a/libutil/login_crypt.c b/libutil/login_crypt.c new file mode 100644 index 0000000..fd21c9b --- /dev/null +++ b/libutil/login_crypt.c @@ -0,0 +1,44 @@ +/*- + * Copyright (c) 2000 Brian Fundakowski Feldman + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include + +#include +#include + +const char * +login_setcryptfmt(login_cap_t *lc, const char *def, const char *error) { + const char *cipher; + + cipher = login_getcapstr(lc, "passwd_format", def, NULL); + if (cipher == NULL) + return (error); + if (!crypt_set_format(cipher)) + return (error); + return (cipher); +} -- cgit v1.2.3-56-ge451