Merge pull request #77 from jcbf/bugfix/#76_clientipnat

Fix #76
jcbf · Aug 7, 2020 · 7003197 · 7003197
2 parents 3c54545 + f450f11
commit 7003197
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/smf-spf.c b/smf-spf.c
@@ -848,10 +848,9 @@ static sfsistat smf_connect(SMFICTX *ctx, char *name, _SOCK_ADDR *sa) {
     smfi_setpriv(ctx, context);
     if (conf.ipnats && (d_ip = natip_check(inet_addr(host)))) {
 		snprintf(context->addr, sizeof(context->addr), "%li.%li.%li.%li",
-				d_ip >> 24 & 0xff, d_ip >> 16 & 0xff, d_ip >> 8 & 0xff, d_ip & 0xff);
+			d_ip & 0xff, d_ip >> 8 & 0xff, d_ip >> 16 & 0xff, d_ip >> 24 & 0xff);
         log_message(LOG_INFO, "Found  NAT IP address. Original: %s . Final %li (%s)", host, d_ip,context->addr);
-	}
-    if (conf.fixed_ip) 
+	} else if (conf.fixed_ip) 
             strscpy(context->addr, conf.fixed_ip, sizeof(context->addr) - 1);
     else
             strscpy(context->addr, host, sizeof(context->addr) - 1);