* Always use 'dynload.h' instead of 'dlfcn.h'.

scd/ChangeLog

@@ -1,3 +1,9 @@
+2003-08-14  Timo Schulz  <twoaday@freakmail.de>
+
+	* apdu.c (ct_activate_card): Change the code a little to avoid
+	problems with other readers.
+	* Always use 'dynload.h' instead of 'dlfcn.h'.
+	
 2003-08-05  Werner Koch  <wk@gnupg.org>
 
 	* app-openpgp.c (dump_all_do): Don't analyze constructed DOs after

scd/apdu.c

@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dlfcn.h>
 #include <assert.h>
 
 #include "scdaemon.h"
 #include "apdu.h"
+#include "dynload.h"
 
 #define MAX_READER 4 /* Number of readers we support concurrently. */
 #define CARD_CONNECT_TIMEOUT 1 /* Number of seconds to wait for
@@ -232,8 +232,7 @@ ct_activate_card (int reader)
           return -1;
         }
 
-      if (buf[0] == 0x05)
-        { /* Connected, now activate the card. */           
+      /* Connected, now activate the card. */           
       dad[0] = 1;    /* Destination address: CT. */    
       sad[0] = 2;    /* Source address: Host. */
 
@@ -266,8 +265,6 @@ ct_activate_card (int reader)
       return 0;
     }
  
-    }
- 
   log_info ("ct_activate_card(%d): timeout waiting for card\n", reader);
   return -1;
 }

scd/app.c

@@ -23,12 +23,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dlfcn.h>
+
 
 #include "scdaemon.h"
 #include "app-common.h"
 #include "apdu.h"
 #include "iso7816.h"
+#include "dynload.h"
 
 static char *default_reader_port;
 

scd/atr.c

@@ -23,12 +23,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dlfcn.h>
 #include <assert.h>
 
 #include "scdaemon.h"
 #include "apdu.h"
 #include "atr.h"
+#include "dynload.h"
 
 static int const fi_table[16] = { 0, 372, 558, 744, 1116,1488, 1860, -1,
                                   -1, 512, 768, 1024, 1536, 2048, -1, -1 };

scd/iso7816.c

@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dlfcn.h>
 
 #include "scdaemon.h"
 #include "iso7816.h"
 #include "apdu.h"
+#include "dynload.h"
 
 #define CMD_SELECT_FILE 0xA4
 #define CMD_VERIFY      0x20