diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am index 0e4433bcd..786d73467 100644 --- a/lib/roken/Makefile.am +++ b/lib/roken/Makefile.am @@ -133,7 +133,6 @@ libroken_la_SOURCES = \ timeval.c \ tm2time.c \ unvis.c \ - verify.c \ vis.c \ warnerr.c \ write_pid.c \ diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in index 462dea5b3..e4fd505e6 100644 --- a/lib/roken/roken.h.in +++ b/lib/roken/roken.h.in @@ -810,8 +810,6 @@ int rk_flock(int fd, int operation); ROKEN_LIB_FUNCTION time_t ROKEN_LIB_CALL tm2time (struct tm, int); -ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL unix_verify_user(char *, char *); - ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL roken_concat (char *, size_t, ...); ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL roken_mconcat (char **, size_t, ...); diff --git a/lib/roken/verify.c b/lib/roken/verify.c deleted file mode 100644 index fc8fc57b6..000000000 --- a/lib/roken/verify.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * 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. - * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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. - */ - -#include - -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_CRYPT_H -#include -#endif -#include "roken.h" - -ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL -unix_verify_user(char *user, char *password) -{ - struct passwd *pw; - - pw = k_getpwnam(user); - if(pw == NULL) - return -1; - if(strlen(pw->pw_passwd) == 0 && strlen(password) == 0) - return 0; - if(strcmp(crypt(password, pw->pw_passwd), pw->pw_passwd) == 0) - return 0; - return -1; -} - diff --git a/lib/roken/version-script.map b/lib/roken/version-script.map index 9f4251e07..da1efe4e9 100644 --- a/lib/roken/version-script.map +++ b/lib/roken/version-script.map @@ -203,7 +203,6 @@ HEIMDAL_ROKEN_1.0 { signal; simple_execl; tm2time; - unix_verify_user; unparse_bytes; unparse_bytes_short; unparse_flags;