← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnupg2/oneiric-proposed

« back to all changes in this revision

Viewing changes to agent/command.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2010-01-22 21:49:55 UTC
  • mfrom: (1.1.14 upstream) (7.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100122214955-r2ab5it9rts5gqjf
Tags: 2.0.14-1ubuntu1
https://launchpad.net/bugs/511356
* Merge with Debian testing (lp: #511356). Remaining changes:
  - debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
  - debian/rules: Call dh_installudev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/command.c
1614
1614
     socket_name - Return the name of the socket.
1615
1615
     ssh_socket_name - Return the name of the ssh socket.
1616
1616
     scd_running - Return OK if the SCdaemon is already running.
1617
 
 
 
1617
     s2k_count   - Return the calibrated S2K count.
1618
1618
     cmd_has_option CMD OPT
1619
1619
                 - Returns OK if the command CMD implements the option OPT.
1620
1620
 */
1657
1657
    {
1658
1658
      rc = agent_scd_check_running ()? 0 : gpg_error (GPG_ERR_GENERAL);
1659
1659
    }
 
1660
  else if (!strcmp (line, "s2k_count"))
 
1661
    {
 
1662
      char numbuf[50];
 
1663
 
 
1664
      snprintf (numbuf, sizeof numbuf, "%lu", get_standard_s2k_count ());
 
1665
      rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
 
1666
    }
1660
1667
  else if (!strncmp (line, "cmd_has_option", 14)
1661
1668
           && (line[14] == ' ' || line[14] == '\t' || !line[14]))
1662
1669
    {
1895
1902
  else if (listen_fd != GNUPG_INVALID_FD)
1896
1903
    {
1897
1904
      rc = assuan_init_socket_server_ext (&ctx, listen_fd, 0);
 
1905
      /* FIXME: Need to call assuan_sock_set_nonce for Windows.  But
 
1906
         this branch is currently not used.  */
1898
1907
    }
1899
1908
  else 
1900
1909
    {