TLS resumption: restrict session re-use

[user/henk/code/exim.git] / src / src / lookups / passwd.c

diff --git a/src/src/lookups/passwd.c b/src/src/lookups/passwd.c
index 0a4a7b4e793e66f9e0258b23dd0020c55f6f4717..00e7548343f1fb16c9fa29ada89731b81b96d816 100644 (file)
--- a/src/src/lookups/passwd.c
+++ b/src/src/lookups/passwd.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
@@ -18,8 +19,6 @@
 static void *
 passwd_open(const uschar * filename, uschar ** errmsg)
 {
-filename = filename;     /* Keep picky compilers happy */
-errmsg = errmsg;
 return (void *)(-1);     /* Just return something non-null */
 }
 
@@ -39,12 +38,6 @@ passwd_find(void * handle, const uschar * filename, const uschar * keystring,
 {
 struct passwd *pw;
 
-handle = handle;         /* Keep picky compilers happy */
-filename = filename;
-length = length;
-errmsg = errmsg;
-do_cache = do_cache;
-
 if (!route_finduser(keystring, &pw, NULL)) return FAIL;
 *result = string_sprintf("*:%d:%d:%s:%s:%s", (int)pw->pw_uid, (int)pw->pw_gid,
   pw->pw_gecos, pw->pw_dir, pw->pw_shell);
@@ -61,12 +54,13 @@ return OK;
 
 #include "../version.h"
 
-void
-passwd_version_report(FILE *f)
+gstring *
+passwd_version_report(gstring * g)
 {
 #ifdef DYNLOOKUP
-fprintf(f, "Library version: passwd: Exim version %s\n", EXIM_VERSION_STR);
+g = string_fmt_append(g, "Library version: passwd: Exim version %s\n", EXIM_VERSION_STR);
 #endif
+return g;
 }
 
 static lookup_info _lookup_info = {