diff options
| -rw-r--r-- | g13/ChangeLog | 10 | ||||
| -rw-r--r-- | g13/Makefile.am | 5 | ||||
| -rw-r--r-- | g13/call-gpg.c | 6 | ||||
| -rw-r--r-- | g13/g13.c | 15 | ||||
| -rw-r--r-- | g13/g13.h | 2 | ||||
| -rw-r--r-- | g13/server.c | 6 |
6 files changed, 3 insertions, 41 deletions
diff --git a/g13/ChangeLog b/g13/ChangeLog index 1430297b2..5d74c7098 100644 --- a/g13/ChangeLog +++ b/g13/ChangeLog @@ -1,11 +1,3 @@ -2009-10-16 Marcus Brinkmann <marcus@g10code.com> - * AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth. - * g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. - (main): Call assuan_set_system_hooks. - -2009-10-16 Marcus Brinkmann <marcus@g10code.com> - - * Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS). - (g13_LDADD): Add $(KSBA_LIBS). + Under initial development - no need for a ChangeLog. diff --git a/g13/Makefile.am b/g13/Makefile.am index cf25f6945..84004cb34 100644 --- a/g13/Makefile.am +++ b/g13/Makefile.am @@ -24,8 +24,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \ - $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) g13_SOURCES = \ g13.c g13.h \ @@ -42,6 +41,6 @@ g13_SOURCES = \ be-truecrypt.c be-truecrypt.h g13_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \ + $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \ $(GPG_ERROR_LIBS) $(LIBINTL) diff --git a/g13/call-gpg.c b/g13/call-gpg.c index dd519021e..6e5c55f40 100644 --- a/g13/call-gpg.c +++ b/g13/call-gpg.c @@ -100,12 +100,6 @@ start_gpg (ctrl_t ctrl, int input_fd, int output_fd, assuan_context_t *r_ctx) /* Connect to GPG and perform initial handshaking. */ err = assuan_pipe_connect (ctx, opt.gpg_program, argv, no_close_list); - - /* if (!err) */ - /* err = assuan_transact (ctx, "OPTION audit-events=1", */ - /* NULL, NULL, NULL, NULL, NULL, NULL); */ - /* audit_log_ok (ctrl->audit, AUDIT_GPG_READY, err); */ - if (err) { assuan_release (ctx); @@ -123,8 +123,6 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"), ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"), - ARGPARSE_s_s (oAuditLog, "audit-log", - N_("|FILE|write an audit log to FILE")), ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")), ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")), @@ -350,7 +348,6 @@ main ( int argc, char **argv) int no_more_options = 0; int default_config =1; char *logfile = NULL; - char *auditlog = NULL; int greeting = 0; int nogreeting = 0; int debug_wait = 0; @@ -359,7 +356,6 @@ main ( int argc, char **argv) int nokeysetup = 0; enum cmd_and_opt_values cmd = 0; struct server_control_s ctrl; - estream_t auditfp = NULL; strlist_t recipients = NULL; /*mtrace();*/ @@ -526,8 +522,6 @@ main ( int argc, char **argv) case oLogFile: logfile = pargs.r.ret_str; break; case oNoLogFile: logfile = NULL; break; - case oAuditLog: auditlog = pargs.r.ret_str; break; - case oNoDetach: nodetach = 1; break; case oDebug: debug_value |= pargs.r.ret_ulong; break; @@ -750,15 +744,6 @@ main ( int argc, char **argv) if (!err) join_idle_task (); - /* Print the audit result if needed. */ - if (auditlog && auditfp) - { - /* audit_print_result (ctrl.audit, auditfp, 0); */ - /* audit_release (ctrl.audit); */ - ctrl.audit = NULL; - es_fclose (auditfp); - } - /* Cleanup. */ g13_exit (0); return 8; /*NOTREACHED*/ @@ -29,7 +29,6 @@ #include "../common/util.h" #include "../common/status.h" #include "../common/estream.h" -#include "../common/audit.h" #include "../common/session-env.h" /* A large struct named "opt" to keep global flags. */ @@ -91,7 +90,6 @@ struct server_control_s int status_fd; /* Only for non-server mode */ struct server_local_s *server_local; - audit_ctx_t audit; /* NULL or a context for the audit subsystem. */ int agent_seen; /* Flag indicating that the gpg-agent has been accessed. */ diff --git a/g13/server.c b/g13/server.c index 900dbc909..585b9e7aa 100644 --- a/g13/server.c +++ b/g13/server.c @@ -167,12 +167,6 @@ option_handler (assuan_context_t ctx, const char *key, const char *value) { err = session_env_setenv (opt.session_env, "PINENTRY_USER_DATA", value); } - else if (!strcmp (key, "enable-audit-log")) - { - /* This is not yet used. */ - /* int i = *value? atoi (value) : 0; */ - /* ctrl->server_local->enable_audit_log = i; */ - } else if (!strcmp (key, "allow-pinentry-notify")) { ; /* We always allow it. */ |