From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 24 Jun 2013 17:10:22 +0000 (+0200)
Subject: - started update of idents patch to 2.10.1
X-Git-Tag: auto/th/postfix-2.10.1-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpostfix.git;a=commitdiff_plain;h=9f3d4e6e844ca48e9ca3acc36a13d96c274cc7a1

- started update of idents patch to 2.10.1
---

diff --git a/postfix-ident.patch b/postfix-ident.patch
index 8cbd612..42193e7 100644
--- a/postfix-ident.patch
+++ b/postfix-ident.patch
@@ -178,13 +178,13 @@ diff -urN -x '*~' postfix-2.2.5/src/smtpd/smtpd_ident.c postfix-2.2.5-ident/src/
  SRCS	= smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
  	smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \
  	smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c \
--	smtpd_expand.c
-+	smtpd_expand.c smtpd_ident.c
+-	smtpd_expand.c smtpd_haproxy.c
++	smtpd_expand.c smtpd_haproxy.c smtpd_ident.c
  OBJS	= smtpd.o smtpd_token.o smtpd_check.o smtpd_chat.o smtpd_state.o \
  	smtpd_peer.o smtpd_sasl_proto.o smtpd_sasl_glue.o smtpd_proxy.o \
  	smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_resolve.o \
--	smtpd_expand.o
-+	smtpd_expand.o smtpd_ident.o
+-	smtpd_expand.o smtpd_haproxy.o
++	smtpd_expand.o smtpd_haproxy.o smtpd_ident.o
  HDRS	= smtpd_token.h smtpd_check.h smtpd_chat.h smtpd_sasl_proto.h \
  	smtpd_sasl_glue.h smtpd_proxy.h smtpd_dsn_fix.h smtpd_milter.h \
  	smtpd_resolve.h smtpd_expand.h
@@ -270,8 +270,8 @@ diff -urN -x '*~' postfix-2.2.5/src/smtpd/smtpd_ident.c postfix-2.2.5-ident/src/
  #include <valid_mailhost_addr.h>
  #include <mail_params.h>
 @@ -125,6 +127,8 @@
- 
- #include "smtpd.h"
+     }
+ }
  
 +extern NAMADR_LIST *smtpd_ident_lookup;
 +
@@ -333,10 +333,12 @@ diff -urN -x '*~' postfix-2.2.5/src/smtpd/smtpd_ident.c postfix-2.2.5-ident/src/
      }
  
      /*
-@@ -401,5 +425,6 @@
-     myfree(state->addr);
-     myfree(state->namaddr);
-     myfree(state->rfc_addr);
-+    myfree(state->ident_user);
-     myfree(state->port);
- }
+@@ -401,6 +425,8 @@
+ 	myfree(state->namaddr);
+     if (state->rfc_addr)
+ 	myfree(state->rfc_addr);
++    if (state->ident_user)
++	myfree(state->ident_user);
+     if (state->port)
+ 	myfree(state->port);
+     if (state->dest_addr)