Index: sup-20091019/Makefile
===================================================================
--- sup-20091019.orig/Makefile	2009-10-20 17:24:06.000000000 +0200
+++ sup-20091019/Makefile	2009-10-20 17:25:53.000000000 +0200
@@ -105,7 +105,7 @@
 OSF_LIBS		= -lbsd
 EXTRALIBS		= libextra.a
 sup_OFILES		= ${SUPCL} ${SUPS}
-supfilesrv_OFILES	= supfilesrv.o scan.o ${SUPS}
+supfilesrv_OFILES	= supfilesrv.o scan.o ${SUPS} wrap_pwd.o
 supfilesrv_LIBS		= libextra.a 
 supscan_OFILES		= supscan.o stree.o scan.o
 SOLARIS_LIBS		= -lsocket -lnsl
Index: sup-20091019/wrap_pwd.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ sup-20091019/wrap_pwd.h	2009-10-20 17:25:53.000000000 +0200
@@ -0,0 +1,16 @@
+/* wrap_pwd.h: Copyright (C) TOYODA Eizi, 1997
+ * In the public domain.
+ */
+
+#ifndef _WRAP_PWD_H
+# define _WRAP_PWD_H
+
+struct passwd *wrap_getpwnam(const char *name);
+struct passwd *wrap_getpwuid(uid_t uid);
+
+# ifndef _WRAP_PWD_NO_MACROS
+#  define getpwnam(name)      wrap_getpwnam(name)
+#  define getpwuid(uid)               wrap_getpwuid(uid)
+# endif /* _WRAP_PWD_NO_MACROS */
+
+#endif /* _WRAP_PWD_H */
Index: sup-20091019/wrap_pwd.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ sup-20091019/wrap_pwd.c	2009-10-20 17:25:53.000000000 +0200
@@ -0,0 +1,36 @@
+/* wrap_pwd.c: Copyright (C) TOYODA Eizi, 1997 */
+/* In the public domain. */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <pwd.h>
+#include <shadow.h>
+
+#define _WRAP_PWD_NO_MACROS
+#include "wrap_pwd.h"
+
+static struct passwd  pw;
+
+      struct passwd *
+wrap_getpwnam(const char *name)
+{
+      struct passwd   *xpw;
+      struct spwd     *shadow;
+      pw = *(xpw = getpwnam(name));
+      if ((shadow = getspnam(name)) != NULL) {
+              pw.pw_passwd = shadow->sp_pwdp;
+      }
+      return &pw;
+}
+
+      struct passwd *
+wrap_getpwuid(uid_t uid)
+{
+      struct passwd   *xpw;
+      struct spwd     *shadow;
+      pw = *(xpw = getpwuid(uid));
+      if ((shadow = getspnam(pw.pw_name)) != NULL) {
+              pw.pw_passwd = shadow->sp_pwdp;
+      }
+      return &pw;
+}
Index: sup-20091019/supfilesrv.c
===================================================================
--- sup-20091019.orig/supfilesrv.c	2009-10-20 17:24:24.000000000 +0200
+++ sup-20091019/supfilesrv.c	2009-10-20 17:25:53.000000000 +0200
@@ -217,6 +217,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <pwd.h>
+#include "wrap_pwd.h"
 #include <grp.h>
 #include <fcntl.h>
 #include <stdarg.h>