tidying

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index a6cb2f80d95dcb2ca3d0f201b6232ea514022478..67ac082bac8a9a0bc76a27aa24824da4acc667d2 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -224,7 +224,7 @@ macro-tls.o:                auths/tls.c
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/tls.c
 
 macro_predef: $(OBJ_MACRO)
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/tls.c
 
 macro_predef: $(OBJ_MACRO)

-       @echo "$(LNCC) -o $<"
+       @echo "$(LNCC) -o $@"

        $(FE)$(LNCC) -o $@ $(LFLAGS) $(OBJ_MACRO)
 
 macro.c: macro_predef
        $(FE)$(LNCC) -o $@ $(LFLAGS) $(OBJ_MACRO)
 
 macro.c: macro_predef

diff --git a/src/src/pdkim/signing.h b/src/src/pdkim/signing.h
index 8aab28a70fc195ffc6eea03ae505eb9d2360ef06..abf25598800f8ad7afd8dd36a08e713367fbb91e 100644 (file)
--- a/src/src/pdkim/signing.h
+++ b/src/src/pdkim/signing.h
@@ -75,7 +75,7 @@ extern void exim_dkim_init(void);
 extern blob * exim_dkim_data_append(blob *, int *, uschar *);
 
 extern const uschar * exim_dkim_signing_init(uschar *, es_ctx *);
 extern blob * exim_dkim_data_append(blob *, int *, uschar *);
 
 extern const uschar * exim_dkim_signing_init(uschar *, es_ctx *);

-extern const uschar * exim_dkim_sign(es_ctx *, BOOL, blob *, blob *);
+extern const uschar * exim_dkim_sign(es_ctx *, hashmethod, blob *, blob *);

 extern const uschar * exim_dkim_verify_init(blob *, ev_ctx *);
 extern const uschar * exim_dkim_verify(ev_ctx *, hashmethod, blob *, blob *);
 
 extern const uschar * exim_dkim_verify_init(blob *, ev_ctx *);
 extern const uschar * exim_dkim_verify(ev_ctx *, hashmethod, blob *, blob *);