X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2Fnss%2Fnss_gns_query.c;h=380788d35d0cea3a761cbd87db8781edf050e26d;hb=557f5487b3e82416ff315989528e2ba6714cc650;hp=032b2c93bd3752b2ce5a4e5e8b899876c21601b5;hpb=727f0d8a8735dd638ff2f714f19c8c23852b99ba;p=oweals%2Fgnunet.git
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c
index 032b2c93b..380788d35 100644
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/gns/nss/nss_gns_query.c
@@ -14,6 +14,8 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
#include
#include
@@ -22,8 +24,23 @@
#include
#include
#include
+#include
#include
#include
+#include
+#include
+
+
+static void
+kwait (pid_t chld)
+{
+ int ret;
+
+ kill (chld, SIGKILL);
+ waitpid (chld,
+ &ret,
+ 0);
+}
/**
@@ -44,36 +61,45 @@ gns_resolve_name (int af,
struct userdata *u)
{
FILE *p;
- char *cmd;
char line[128];
int ret;
- int es;
+ int out[2];
+ pid_t pid;
- if (AF_INET6 == af)
+ if (0 != pipe (out))
+ return -1;
+ pid = fork ();
+ if (-1 == pid)
+ return -1;
+ if (0 == pid)
{
- if (-1 == asprintf (&cmd,
- "%s -t AAAA -u %s\n",
- "gnunet-gns -r",
- name))
- return -1;
+ char *argv[] = {
+ "gnunet-gns",
+ "-r",
+ "-t",
+ (AF_INET6 == af) ? "AAAA" : "A",
+ "-u",
+ (char *) name,
+ NULL
+ };
+
+ (void) close (STDOUT_FILENO);
+ if ( (0 != close (out[0])) ||
+ (STDOUT_FILENO != dup2 (out[1], STDOUT_FILENO)) )
+ _exit (1);
+ (void) execvp ("gnunet-gns",
+ argv);
+ _exit (1);
}
- else
- {
- if (-1 == asprintf (&cmd,
- "%s %s\n",
- "gnunet-gns -r -u",
- name))
+ (void) close (out[1]);
+ p = fdopen (out[0], "r");
+ if (NULL == p)
+ {
+ kwait (pid);
return -1;
- }
- if (NULL == (p = popen (cmd, "r")))
- {
- es = errno;
- free (cmd);
- errno = es;
- return -1;
- }
+ }
while (NULL != fgets (line,
- sizeof(line),
+ sizeof (line),
p))
{
if (u->count >= MAX_ENTRIES)
@@ -92,8 +118,8 @@ gns_resolve_name (int af,
}
else
{
- (void) pclose (p);
- free (cmd);
+ (void) fclose (p);
+ kwait (pid);
errno = EINVAL;
return -1;
}
@@ -109,19 +135,21 @@ gns_resolve_name (int af,
}
else
{
- (void) pclose (p);
- free (cmd);
+ (void) fclose (p);
+ kwait (pid);
errno = EINVAL;
return -1;
}
}
}
}
- ret = pclose (p);
- free (cmd);
- if (! WIFEXITED (ret))
+ (void) fclose (p);
+ waitpid (pid,
+ &ret,
+ 0);
+ if (! WIFEXITED (ret))
return -1;
- if (4 == WEXITSTATUS (ret))
+ if (4 == WEXITSTATUS (ret))
return -2; /* not for GNS */
if (3 == ret)
return -3; /* timeout -> not found */