Index: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	(revision 110)
+++ trunk/Makefile.in	(revision 111)
@@ -1680,5 +1680,5 @@
 yulectl.o: $(srcsrc)/yulectl.c Makefile config_xor.h 
 sh_mounts.o: $(srcsrc)/sh_mounts.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_modules.h $(srcinc)/sh_mounts.h 
-sh_userfiles.o: $(srcsrc)/sh_userfiles.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_userfiles.h $(srcinc)/sh_utils.h $(srcinc)/sh_schedule.h $(srcinc)/sh_error.h $(srcinc)/sh_hash.h $(srcinc)/sh_files.h 
+sh_userfiles.o: $(srcsrc)/sh_userfiles.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_userfiles.h $(srcinc)/sh_utils.h $(srcinc)/sh_schedule.h $(srcinc)/sh_error.h $(srcinc)/sh_hash.h $(srcinc)/sh_files.h $(srcinc)/sh_static.h 
 sh_prelude.o: $(srcsrc)/sh_prelude.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_cat.h $(srcinc)/sh_error_min.h $(srcinc)/sh_prelude.h 
 kern_head.o: $(srcsrc)/kern_head.c Makefile config.h $(srcinc)/kern_head.h $(srcinc)/kern_head.h 
Index: trunk/depend.dep
===================================================================
--- trunk/depend.dep	(revision 110)
+++ trunk/depend.dep	(revision 111)
@@ -54,5 +54,5 @@
 yulectl.o: $(srcsrc)/yulectl.c Makefile config_xor.h 
 sh_mounts.o: $(srcsrc)/sh_mounts.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_modules.h $(srcinc)/sh_mounts.h 
-sh_userfiles.o: $(srcsrc)/sh_userfiles.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_userfiles.h $(srcinc)/sh_utils.h $(srcinc)/sh_schedule.h $(srcinc)/sh_error.h $(srcinc)/sh_hash.h $(srcinc)/sh_files.h 
+sh_userfiles.o: $(srcsrc)/sh_userfiles.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_userfiles.h $(srcinc)/sh_utils.h $(srcinc)/sh_schedule.h $(srcinc)/sh_error.h $(srcinc)/sh_hash.h $(srcinc)/sh_files.h $(srcinc)/sh_static.h 
 sh_prelude.o: $(srcsrc)/sh_prelude.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_cat.h $(srcinc)/sh_error_min.h $(srcinc)/sh_prelude.h 
 sh_prelink.o: $(srcsrc)/sh_prelink.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_extern.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h 
Index: trunk/depend.sum
===================================================================
--- trunk/depend.sum	(revision 110)
+++ trunk/depend.sum	(revision 111)
@@ -1,1 +1,1 @@
-4114523250
+1096789008
Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 110)
+++ trunk/docs/Changelog	(revision 111)
@@ -1,2 +1,5 @@
+2.3.6:
+	* sh_gpg.c, sh_userfiles.c: use sh_getpwnam et al. wrappers
+
 2.3.5:
 	* sh_portcheck.c: try to tear down connections more gracefully
Index: trunk/include/sh_static.h
===================================================================
--- trunk/include/sh_static.h	(revision 110)
+++ trunk/include/sh_static.h	(revision 111)
@@ -33,4 +33,5 @@
 #define sh_getpwuid   getpwuid
 #define sh_endpwent   endpwent
+#define sh_setpwent   setpwent
 
 #define sh_gethostbyaddr gethostbyaddr
Index: trunk/src/sh_gpg.c
===================================================================
--- trunk/src/sh_gpg.c	(revision 110)
+++ trunk/src/sh_gpg.c	(revision 111)
@@ -292,7 +292,6 @@
       struct stat lbuf;
       int         status_stat = 0;
-      struct passwd * tempres = getpwnam(DEFAULT_IDENT);
-      if (!tempres)
-	tempres = sh_getpwnam(DEFAULT_IDENT);
+      struct passwd * tempres = sh_getpwnam(DEFAULT_IDENT);
+
       if (!tempres)
 	{
@@ -953,7 +952,6 @@
       TPT(((0), FIL__, __LINE__, _("msg=<GPG_CHECK: FD1 = %d>\n"), fd1));
 #if defined(SH_WITH_SERVER)
-      tempres = getpwnam(DEFAULT_IDENT);
-      if (!tempres)
-	tempres = sh_getpwnam(DEFAULT_IDENT);
+      tempres = sh_getpwnam(DEFAULT_IDENT);
+
       if ((tempres != NULL) && (0 == sl_ret_euid()))
 	{
@@ -971,7 +969,6 @@
       TPT(((0), FIL__, __LINE__, _("msg=<GPG_CHECK: FD2 = %d>\n"), fd2));
 #if defined(SH_WITH_SERVER)
-      tempres = getpwnam(DEFAULT_IDENT);
-      if (!tempres)
-	tempres = sh_getpwnam(DEFAULT_IDENT);
+      tempres = sh_getpwnam(DEFAULT_IDENT);
+
       if ((tempres != NULL) && (0 == sl_ret_euid()))
 	{
@@ -1080,7 +1077,6 @@
 
 #if defined(SH_WITH_SERVER)
-      struct passwd * e_tempres = getpwnam(DEFAULT_IDENT);
-      if (!e_tempres)
-	e_tempres = sh_getpwnam(DEFAULT_IDENT);
+      struct passwd * e_tempres = sh_getpwnam(DEFAULT_IDENT);
+
       if ((e_tempres != NULL) && (0 == sl_ret_euid()))   
 	{
Index: trunk/src/sh_userfiles.c
===================================================================
--- trunk/src/sh_userfiles.c	(revision 110)
+++ trunk/src/sh_userfiles.c	(revision 111)
@@ -39,4 +39,6 @@
 #include "sh_hash.h"
 #include "sh_files.h"
+#define SH_NEED_PWD_GRP 1
+#include "sh_static.h"
 
 #ifdef SH_USE_USERFILES
@@ -266,7 +268,7 @@
      * getpwent() too */
     /*@-unrecog@*/
-    setpwent();
+    sh_setpwent();
     /*@+unrecog@*/
-    while( ( cur_user = /*@-unrecog@*/getpwent()/*@+unrecog@*/ ) != NULL ) {
+    while( ( cur_user = /*@-unrecog@*/sh_getpwent()/*@+unrecog@*/ ) != NULL ) {
         int found = 0;
 
Index: trunk/src/trustfile.c
===================================================================
--- trunk/src/trustfile.c	(revision 110)
+++ trunk/src/trustfile.c	(revision 111)
@@ -429,5 +429,5 @@
 	  /* map user name to UID and compare */
 #ifdef TRUST_MAIN
-	  if ((w = getpwnam(*p)) != NULL && *u == (uid_t)(w->pw_uid) )
+	  if ((w = sh_getpwnam(*p)) != NULL && *u == (uid_t)(w->pw_uid) )
 	    SL_IRETURN(SL_TRUE, _("isingrp"));
 #else
@@ -445,5 +445,5 @@
     {
 #ifdef TRUST_MAIN
-      if ((w = getpwuid(*u)) != NULL && grp == (gid_t)(w->pw_gid) )
+      if ((w = sh_getpwuid(*u)) != NULL && grp == (gid_t)(w->pw_gid) )
 	SL_IRETURN(SL_TRUE, _("isingrp"));
 #else
@@ -961,5 +961,5 @@
   tf_path[0] = '\0';
 #if defined(SH_WITH_SERVER)
-  pass = getpwnam(SH_IDENT);
+  pass = sh_getpwnam(SH_IDENT);
   if (pass != NULL)
     tf_euid = pass->pw_uid;