[svn] GnuPG - r5182 - trunk/g13

[svn author wk]

Author: wk
Date: 2009-10-17 21:15:15 +0200 (Sat, 17 Oct 2009)
New Revision: 5182

Modified:
   trunk/g13/ChangeLog
   trunk/g13/Makefile.am
   trunk/g13/call-gpg.c
   trunk/g13/g13.c
   trunk/g13/g13.h
   trunk/g13/server.c
Log:
Removed audit.h cruft which forced us to link against libksba.
There is no need for an audit file.


Modified: trunk/g13/ChangeLog
===================================================================
--- trunk/g13/ChangeLog	2009-10-16 18:35:03 UTC (rev 5181)
+++ trunk/g13/ChangeLog	2009-10-17 19:15:15 UTC (rev 5182)
@@ -1,11 +1,3 @@
-2009-10-16  Marcus Brinkmann  <marcus at 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.
+	Under initial development - no need for a ChangeLog.
 
-2009-10-16  Marcus Brinkmann  <marcus at g10code.com>
-
-	* Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS).
-	(g13_LDADD): Add $(KSBA_LIBS).
-

Modified: trunk/g13/Makefile.am
===================================================================
--- trunk/g13/Makefile.am	2009-10-16 18:35:03 UTC (rev 5181)
+++ trunk/g13/Makefile.am	2009-10-17 19:15:15 UTC (rev 5182)
@@ -24,8 +24,7 @@
 
 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 @@
 	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)
 

Modified: trunk/g13/call-gpg.c
===================================================================
--- trunk/g13/call-gpg.c	2009-10-16 18:35:03 UTC (rev 5181)
+++ trunk/g13/call-gpg.c	2009-10-17 19:15:15 UTC (rev 5182)
@@ -100,12 +100,6 @@
 
   /* 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);

Modified: trunk/g13/g13.c
===================================================================
--- trunk/g13/g13.c	2009-10-16 18:35:03 UTC (rev 5181)
+++ trunk/g13/g13.c	2009-10-17 19:15:15 UTC (rev 5182)
@@ -123,8 +123,6 @@
   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 @@
   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 @@
   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 @@
         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 @@
   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*/

Modified: trunk/g13/g13.h
===================================================================
--- trunk/g13/g13.h	2009-10-16 18:35:03 UTC (rev 5181)
+++ trunk/g13/g13.h	2009-10-17 19:15:15 UTC (rev 5182)
@@ -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 @@
   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.  */
   

Modified: trunk/g13/server.c
===================================================================
--- trunk/g13/server.c	2009-10-16 18:35:03 UTC (rev 5181)
+++ trunk/g13/server.c	2009-10-17 19:15:15 UTC (rev 5182)
@@ -167,12 +167,6 @@
     {
       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.  */