X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=mts%2Fsmtp%2Fsmtp.c;h=faca17af8a42e9de5e884064534de8505ce3ff5a;hb=9e1f6d6d4c2e154c7274e7fb3f1931924e458b17;hp=8d3a23337e24a5107aa21af6affe607daf9a9d84;hpb=096c67eb7451cd78ed1e74c5b2a0c07ceb5c69d9;p=mmh

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 8d3a233..faca17a 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -70,7 +70,9 @@
 #define	SM_DOT	600	/* see above */
 #define	SM_QUIT	 30
 #define	SM_CLOS	 10
+#ifdef CYRUS_SASL
 #define	SM_AUTH  45
+#endif /* CYRUS_SASL */
 
 static int sm_addrs = 0;
 static int sm_alarmed = 0;
@@ -158,7 +160,7 @@ static int sm_werror (void);
 static int smhear (void);
 static int sm_rrecord (char *, int *);
 static int sm_rerror (int);
-static RETSIGTYPE alrmser (int);
+static void alrmser (int);
 static char *EHLOset (char *);
 static int sm_fwrite(char *, int);
 static int sm_fputs(char *);
@@ -194,6 +196,10 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 {
 #ifdef CYRUS_SASL
     char *server_mechs;
+#else  /* CYRUS_SASL */
+    NMH_UNUSED (sasl);
+    NMH_UNUSED (saslmech);
+    NMH_UNUSED (user);
 #endif /* CYRUS_SASL */
     int result, sd1, sd2;
 
@@ -210,7 +216,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	if (clientname) {
 	    client = clientname;
 	} else {
-	    client = LocalName();	/* no clientname -> LocalName */
+	    client = LocalName(1);	/* no clientname -> LocalName */
 	}
     }
 
@@ -396,6 +402,8 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	    return RP_RPLY;
 	}
     }
+#else  /* TLS_SUPPORT */
+    NMH_UNUSED (tls);
 #endif /* TLS_SUPPORT */
 
 #ifdef CYRUS_SASL
@@ -445,8 +453,13 @@ sendmail_init (char *client, char *server, int watch, int verbose,
 {
 #ifdef CYRUS_SASL
     char *server_mechs;
+#else  /* CYRUS_SASL */
+    NMH_UNUSED (server);
+    NMH_UNUSED (sasl);
+    NMH_UNUSED (saslmech);
+    NMH_UNUSED (user);
 #endif /* CYRUS_SASL */
-    int i, result, vecp;
+    unsigned int i, result, vecp;
     int pdi[2], pdo[2];
     char *vec[15];
 
@@ -462,7 +475,7 @@ sendmail_init (char *client, char *server, int watch, int verbose,
 	if (clientname)
 	    client = clientname;
 	else
-	    client = LocalName();	/* no clientname -> LocalName */
+	    client = LocalName(1);	/* no clientname -> LocalName */
     }
 
     /*
@@ -1121,6 +1134,8 @@ static int
 sm_get_pass(sasl_conn_t *conn, void *context, int id,
 	    sasl_secret_t **psecret)
 {
+    NMH_UNUSED (conn);
+
     char **pw_context = (char **) context;
     char *pass = NULL;
     int len;
@@ -1663,9 +1678,11 @@ sm_rerror (int rc)
 }
 
 
-static RETSIGTYPE
+static void
 alrmser (int i)
 {
+    NMH_UNUSED (i);
+
 #ifndef	RELIABLE_SIGNALS
     SIGNAL (SIGALRM, alrmser);
 #endif