summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Kistner <tom@duncanthrax.net>2005-06-27 18:10:30 +0000
committerTom Kistner <tom@duncanthrax.net>2005-06-27 18:10:30 +0000
commitec998f2bbc71aea870948abf762bc23b3ff9c85c (patch)
tree409c3458c5890532c79899db67f48d31555db15f /src
parent56dda33cf61fd2979f6422699afa3edd50c3abee (diff)
Fixed some compiler warnings
Diffstat (limited to 'src')
-rw-r--r--src/src/srs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/src/srs.c b/src/src/srs.c
index e534943b3..69f35bf99 100644
--- a/src/src/srs.c
+++ b/src/src/srs.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/srs.c,v 1.7 2005/05/25 17:50:33 tom Exp $ */
+/* $Cambridge: exim/src/src/srs.c,v 1.8 2005/06/27 18:10:30 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -29,7 +29,7 @@ int eximsrs_init()
{
uschar *list = srs_config;
uschar secret_buf[SRS_MAX_SECRET_LENGTH];
- uschar *secret;
+ uschar *secret = NULL;
uschar sbuf[4];
uschar *sbufp;
@@ -71,7 +71,7 @@ int eximsrs_init()
/* First secret specified in secrets? */
co = 0;
list = srs_secrets;
- if(secret == NULL || *secret == NULL)
+ if(secret == NULL || *secret == '\0')
{
if((secret = string_nextinlist(&list, &co, secret_buf, SRS_MAX_SECRET_LENGTH)) == NULL)
{
@@ -107,7 +107,7 @@ int eximsrs_init()
/* Extra secrets? */
while((secret = string_nextinlist(&list, &co, secret_buf, SRS_MAX_SECRET_LENGTH)) != NULL)
- srs_add_secret(srs, secret, strnlen(secret, SRS_MAX_SECRET_LENGTH));
+ srs_add_secret(srs, secret, (Ustrlen(secret) > SRS_MAX_SECRET_LENGTH) ? SRS_MAX_SECRET_LENGTH : Ustrlen(secret));
DEBUG(D_any)
debug_printf("SRS initialized\n");