Attachment #605 for bug #5310

View | Details | Raw Unified | Return to bug 5310
Collapse All | Expand All




      int len;
      struct sockaddr_un serv_addr;
      char *p;
      char *tmpdir;

      /* Get TMPDIR variable.  Don't use $TMPDIR if it unset or
        set to empty string. */
      tmpdir = getenv("TMPDIR");
      if (tmpdir == NULL)
        tmpdir = getenv("TMP");
      if (tmpdir != NULL && tmpdir[0] == 0)
        tmpdir = NULL;

      /* Remove the DISPLAY variable so that a pinentry does not
         default to a specific display.  There is still a default


      *socket_name = 0;
      snprintf (socket_name, DIM(socket_name)-1,
                "%s/gpg-XXXXXX/S.gpg-agent", tmpdir != NULL ? tmpdir : "/tmp");
      socket_name[DIM(socket_name)-1] = 0;
      p = strrchr (socket_name, '/');
      if (!p)




      int len;
      struct sockaddr_un serv_addr;
      char *p;
      char *tmpdir;

      /* Get TMPDIR variable.  Don't use $TMPDIR if it unset or
        set to empty string. */
      tmpdir = getenv("TMPDIR");
      if (tmpdir == NULL)
        tmpdir = getenv("TMP");
      if (tmpdir != NULL && tmpdir[0] == 0)
        tmpdir = NULL;

      /* fixme: if there is already a running gpg-agent we should
         share the same directory - and vice versa */
      *socket_name = 0;
      snprintf (socket_name, DIM(socket_name)-1,
                "%s/gpg-XXXXXX/S.scdaemon", tmpdir != NULL ? tmpdir : "/tmp");
      socket_name[DIM(socket_name)-1] = 0;
      p = strrchr (socket_name, '/');
      if (!p)

Return to bug 5310

Lines 678-683 Link Here

(-)gnupg-1.9.7-orig/agent/gpg-agent.c (-1 / +10 lines)
678	int len;	678	int len;
679	struct sockaddr_un serv_addr;	679	struct sockaddr_un serv_addr;
680	char *p;	680	char *p;
		681	char *tmpdir;
		682
		683	/* Get TMPDIR variable. Don't use $TMPDIR if it unset or
		684	set to empty string. */
		685	tmpdir = getenv("TMPDIR");
		686	if (tmpdir == NULL)
		687	tmpdir = getenv("TMP");
		688	if (tmpdir != NULL && tmpdir[0] == 0)
		689	tmpdir = NULL;
681		690
682	/* Remove the DISPLAY variable so that a pinentry does not	691	/* Remove the DISPLAY variable so that a pinentry does not
683	default to a specific display. There is still a default	692	default to a specific display. There is still a default
Lines 688-694 Link Here
688		697
689	*socket_name = 0;	698	*socket_name = 0;
690	snprintf (socket_name, DIM(socket_name)-1,	699	snprintf (socket_name, DIM(socket_name)-1,
691	"/tmp/gpg-XXXXXX/S.gpg-agent");	700	"%s/gpg-XXXXXX/S.gpg-agent", tmpdir != NULL ? tmpdir : "/tmp");
692	socket_name[DIM(socket_name)-1] = 0;	701	socket_name[DIM(socket_name)-1] = 0;
693	p = strrchr (socket_name, '/');	702	p = strrchr (socket_name, '/');
694	if (!p)	703	if (!p)

Lines 584-595 Link Here

(-)gnupg-1.9.7-orig/scd/scdaemon.c (-1 / +10 lines)
584	int len;	584	int len;
585	struct sockaddr_un serv_addr;	585	struct sockaddr_un serv_addr;
586	char *p;	586	char *p;
		587	char *tmpdir;
		588
		589	/* Get TMPDIR variable. Don't use $TMPDIR if it unset or
		590	set to empty string. */
		591	tmpdir = getenv("TMPDIR");
		592	if (tmpdir == NULL)
		593	tmpdir = getenv("TMP");
		594	if (tmpdir != NULL && tmpdir[0] == 0)
		595	tmpdir = NULL;
587		596
588	/* fixme: if there is already a running gpg-agent we should	597	/* fixme: if there is already a running gpg-agent we should
589	share the same directory - and vice versa */	598	share the same directory - and vice versa */
590	*socket_name = 0;	599	*socket_name = 0;
591	snprintf (socket_name, DIM(socket_name)-1,	600	snprintf (socket_name, DIM(socket_name)-1,
592	"/tmp/gpg-XXXXXX/S.scdaemon");	601	"%s/gpg-XXXXXX/S.scdaemon", tmpdir != NULL ? tmpdir : "/tmp");
593	socket_name[DIM(socket_name)-1] = 0;	602	socket_name[DIM(socket_name)-1] = 0;
594	p = strrchr (socket_name, '/');	603	p = strrchr (socket_name, '/');
595	if (!p)	604	if (!p)