← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gnupg2/karmic-security

« back to all changes in this revision

Viewing changes to common/simple-pwquery.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2009-08-04 12:27:49 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090804122749-q0j52zp6xmzvyall
Tags: 2.0.12-0ubuntu1
* New upstream release.
* Add 01-scd-pw2.patch, 03-opgp-writekey.patch, and 06-opgp-sign3072.patch
  from https://bugs.g10code.com/gnupg/issue1094 to make OpenPGP 2.0
  smartcards work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/simple-pwquery.c
39
39
#ifdef HAVE_LOCALE_H
40
40
#include <locale.h>
41
41
#endif
 
42
 
 
43
#define JNLIB_NEED_AFLOCAL
 
44
#include "../jnlib/mischelp.h"
42
45
#ifdef HAVE_W32_SYSTEM
43
46
#include "../jnlib/w32-afunix.h"
44
47
#endif
379
382
  memset (&client_addr, 0, sizeof client_addr);
380
383
  client_addr.sun_family = AF_UNIX;
381
384
  strcpy (client_addr.sun_path, infostr);
382
 
  len = (offsetof (struct sockaddr_un, sun_path)
383
 
         + strlen(client_addr.sun_path) + 1);
 
385
  len = SUN_LEN (&client_addr);
384
386
    
385
387
#ifdef HAVE_W32_SYSTEM       
386
388
  rc = _w32_sock_connect (fd, (struct sockaddr*)&client_addr, len );