Changeset 111 for trunk/src/sh_gpg.c

Timestamp:

Jul 7, 2007, 9:18:46 PM (17 years ago)

Author:

rainer

Message:

Fix for ticket #69 (wrappers for name service routines not used everywhere).

File:

• trunk/src/sh_gpg.c (modified) (4 diffs)

trunk/src/sh_gpg.c

@@ -292 +292 @@
       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 +952 @@
       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 +969 @@
       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 +1077 @@
 
 #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()))   
         {