pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/gld Split patch-ab to one patch per file.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c78e0b84404f
branches: trunk
changeset: 492465:c78e0b84404f
user: salo <salo%pkgsrc.org@localhost>
date: Wed Apr 13 16:36:07 2005 +0000
description:
Split patch-ab to one patch per file.
diffstat:
mail/gld/distinfo | 8 +-
mail/gld/patches/patch-ab | 289 +---------------------------------------------
mail/gld/patches/patch-ac | 81 ++++++++++++
mail/gld/patches/patch-ad | 65 ++++++++++
mail/gld/patches/patch-ae | 95 +++++++++++++++
mail/gld/patches/patch-af | 19 +++
6 files changed, 267 insertions(+), 290 deletions(-)
diffs (truncated from 590 to 300 lines):
diff -r 721cd39ecff0 -r c78e0b84404f mail/gld/distinfo
--- a/mail/gld/distinfo Wed Apr 13 16:31:26 2005 +0000
+++ b/mail/gld/distinfo Wed Apr 13 16:36:07 2005 +0000
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/04/13 16:19:59 christos Exp $
+$NetBSD: distinfo,v 1.4 2005/04/13 16:36:07 salo Exp $
SHA1 (gld-1.5.tgz) = febc398be2e68bf7b4bc6e3015da2f225760204d
RMD160 (gld-1.5.tgz) = dab09c1776fb014effdd3d87d4a6808274bbfdd9
Size (gld-1.4.tgz) = 39030 bytes
SHA1 (patch-aa) = ef415ff661dfe07d02158f5684b1cf182e76f757
-SHA1 (patch-ab) = ac69f29dced3d972837ac90b7ad23bdcbed70c17
+SHA1 (patch-ab) = bde3756d6d8180f13c87a36b69264de5ff385c7c
+SHA1 (patch-ac) = 8d484c0d6a5cbc88f2c4c66143e6aa9a91131bf1
+SHA1 (patch-ad) = 1083bdc0040696a5ac014204c1a4a8e35fdeda53
+SHA1 (patch-ae) = d27cefd2784223792942bd0b5b95fb810972d308
+SHA1 (patch-af) = bde3756d6d8180f13c87a36b69264de5ff385c7c
diff -r 721cd39ecff0 -r c78e0b84404f mail/gld/patches/patch-ab
--- a/mail/gld/patches/patch-ab Wed Apr 13 16:31:26 2005 +0000
+++ b/mail/gld/patches/patch-ab Wed Apr 13 16:36:07 2005 +0000
@@ -1,292 +1,5 @@
-$NetBSD: patch-ab,v 1.1 2005/04/13 16:19:59 christos Exp $
+$NetBSD: patch-ab,v 1.2 2005/04/13 16:36:07 salo Exp $
---- greylist.c.orig 2005-04-13 05:26:10.000000000 -0400
-+++ greylist.c 2005-04-13 12:03:39.000000000 -0400
-@@ -21,8 +21,11 @@
-
- ts=time(0);
- strncpy(oip,ip,sizeof(oip)-1);
-+oip[sizeof(oip)-1] = '\0';
- strncpy(osender,sender,sizeof(osender)-1);
-+osender[sizeof(osender)-1] = '\0';
- strncpy(orecipient,recipient,sizeof(orecipient)-1);
-+orecipient[sizeof(orecipient)-1] = '\0';
-
- if(conf->debug==1) printf("%d: Starting the greylist algo\n",pid);
-
-@@ -68,10 +71,18 @@
- if(conf->debug==1) printf("%d: lightgrey on domain is on, let's keep the domain only on recipient and sender\n",pid);
-
- domain=(char *)strstr(osender,"@");
-- if(domain!=NULL) strncpy(sender,domain,BLEN-1);
-+ if(domain!=NULL)
-+ {
-+ strncpy(sender,domain,BLEN-1);
-+ sender[BLEN-1] = '\0';
-+ }
-
- domain=(char *)strstr(orecipient,"@");
-- if(domain!=NULL) strncpy(recipient,domain,BLEN-1);
-+ if(domain!=NULL)
-+ {
-+ strncpy(recipient,domain,BLEN-1);
-+ recipient[BLEN-1] = '\0';
-+ }
- }
-
- //
-@@ -119,6 +130,7 @@
- if(domain==NULL) domain=osender;
-
- strncpy(netw,oip,sizeof(netw)-1);
-+ netw[sizeof(netw)-1] = '\0';
- l=strlen(netw);
- for(i=l-1;i>=0;i--)
- if(netw[i]=='.')
-@@ -148,7 +160,7 @@
- if(x==4)
- {
- snprintf(query,sizeof(query)-1,"%d.%d.%d.%d.%s",d,c,b,a,conf->dnswl);
-- n=DnsIp(query,NULL);
-+ n=DnsIp(query,NULL, 0);
- if(conf->debug==1) printf("%d: DNSQuery=(%s) result=%ld\n",pid,query,n);
- if(n==0)
- {
---- cnf.c.orig 2005-04-13 12:06:54.000000000 -0400
-+++ cnf.c 2005-04-13 12:11:51.000000000 -0400
-@@ -36,11 +36,16 @@
-
- // We set the default values
-
--strcpy(conf->sqlhost,"localhost");
--strcpy(conf->sqluser,"myuser");
--strcpy(conf->sqldb,"mydb");
--strcpy(conf->sqlpasswd,"mypasswd");
--strcpy(conf->message,"Greylisted");
-+strncpy(conf->sqlhost,"localhost",sizeof(conf->sqlhost)-1);
-+conf->sqlhost[sizeof(conf->sqlhost)-1] = '\0';
-+strncpy(conf->sqluser,"myuser",sizeof(conf->sqluser)-1);
-+conf->sqluser[sizeof(conf->sqluser)-1] = '\0';
-+strncpy(conf->sqldb,"mydb",sizeof(conf->sqldb)-1);
-+conf->sqldb[sizeof(conf->sqldb)-1] = '\0';
-+strncpy(conf->sqlpasswd,"mypasswd",sizeof(conf->sqlpasswd)-1);
-+conf->sqlpasswd[sizeof(conf->sqlpasswd)-1] = '\0';
-+strncpy(conf->message,"Greylisted",sizeof(conf->message)-1);
-+conf->message[sizeof(conf->message)-1] = '\0';
- conf->port=2525;
- conf->maxcon=100;
- conf->mini=60;
-@@ -73,14 +78,46 @@
- buffer[strlen(buffer)-1]=0;
- *p=0;
- if(strcmp(buffer,"CLIENTS")==0) ReadClients(conf,p+1);
-- if(strcmp(buffer,"USER")==0) strcpy(conf->user,p+1);
-- if(strcmp(buffer,"GROUP")==0) strcpy(conf->grp,p+1);
-- if(strcmp(buffer,"DNSWL")==0) strcpy(conf->dnswl,p+1);
-- if(strcmp(buffer,"SQLHOST")==0) strcpy(conf->sqlhost,p+1);
-- if(strcmp(buffer,"SQLUSER")==0) strcpy(conf->sqluser,p+1);
-- if(strcmp(buffer,"SQLDB")==0) strcpy(conf->sqldb,p+1);
-- if(strcmp(buffer,"SQLPASSWD")==0) strcpy(conf->sqlpasswd,p+1);
-- if(strcmp(buffer,"MESSAGE")==0) strcpy(conf->message,p+1);
-+ if(strcmp(buffer,"USER")==0)
-+ {
-+ strncpy(conf->user,p+1,sizeof(conf->user)-1);
-+ conf->user[sizeof(conf->user)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"GROUP")==0)
-+ {
-+ strncpy(conf->grp,p+1,sizeof(conf->grp)-1);
-+ conf->grp[sizeof(conf->grp)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"DNSWL")==0)
-+ {
-+ strncpy(conf->dnswl,p+1,sizeof(conf->dnswl)-1);
-+ conf->dnswl[sizeof(conf->dnswl)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"SQLHOST")==0)
-+ {
-+ strncpy(conf->sqlhost,p+1,sizeof(conf->sqlhost)-1);
-+ conf->sqlhost[sizeof(conf->sqlhost)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"SQLUSER")==0)
-+ {
-+ strncpy(conf->sqluser,p+1,sizeof(conf->sqluser)-1);
-+ conf->sqluser[sizeof(conf->sqluser)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"SQLDB")==0)
-+ {
-+ strncpy(conf->sqldb,p+1,sizeof(conf->sqldb)-1);
-+ conf->sqldb[sizeof(conf->sqldb)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"SQLPASSWD")==0)
-+ {
-+ strncpy(conf->sqlpasswd,p+1,sizeof(conf->sqlpasswd)-1);
-+ conf->sqlpasswd[sizeof(conf->sqlpasswd)-1] = '\0';
-+ }
-+ if(strcmp(buffer,"MESSAGE")==0)
-+ {
-+ strncpy(conf->message,p+1,sizeof(conf->message)-1);
-+ conf->message[sizeof(conf->message)-1] = '\0';
-+ }
- if(strcmp(buffer,"PORT")==0) conf->port=atoi(p+1);
- if(strcmp(buffer,"MAXCON")==0) conf->maxcon=atoi(p+1);
- if(strcmp(buffer,"MINTIME")==0) conf->mini=atol(p+1);
---- server.c.orig 2005-04-13 03:28:29.000000000 -0400
-+++ server.c 2005-04-13 12:15:36.000000000 -0400
-@@ -208,7 +208,7 @@
- int pid;
-
- pid=getpid();
--GetPeerIp(s,ip,buff);
-+GetPeerIp(s,ip,BLEN,buff,BLEN);
-
- //
- // We check if this IP is authorized to connect to us
-@@ -261,21 +261,34 @@
- // Now, we are sure our buffer string length is no more than BLEN
- // as all parameters are defined also as buffers with a BLEN size
- // no buffer overflow is possible using strcpy .
-+ // But what's the point. Protect it anyway.
- //
-
- if(strcmp(buff,"")==0) break;
-
- if(strncmp(buff,"request=",8)==0)
-- strcpy(request,buff+8);
-+ {
-+ strncpy(request,buff+8, sizeof(request)-1);
-+ request[sizeof(request)-1] = '\0';
-+ }
-
- if(strncmp(buff,"sender=",7)==0)
-- strcpy(sender,buff+7);
-+ {
-+ strncpy(sender,buff+7, sizeof(sender)-1);
-+ sender[sizeof(sender)-1] = '\0';
-+ }
-
- if(strncmp(buff,"recipient=",10)==0)
-- strcpy(recipient,buff+10);
-+ {
-+ strncpy(recipient,buff+10, sizeof(recipient)-1);
-+ recipient[sizeof(recipient)-1] = '\0';
-+ }
-
- if(strncmp(buff,"client_address=",15)==0)
-- strcpy(ip,buff+15);
-+ {
-+ strncpy(ip,buff+15,sizeof(ip)-1);
-+ ip[sizeof(ip)-1] = '\0';
-+ }
-
- }
-
-@@ -300,7 +313,11 @@
- // Now, we can safely use, str** functions
- //
-
--if(sender[0]==0) strcpy(sender,"void@void");
-+if(sender[0]==0)
-+ {
-+ strncpy(sender,"void@void",sizeof(sender)-1);
-+ sender[sizeof(sender)-1] = '\0';
-+ }
-
- if(strcmp(request,REQ)!=0 || recipient[0]==0 || ip[0]==0)
- {
---- sockets.c.orig 2004-10-12 08:39:34.000000000 -0400
-+++ sockets.c 2005-04-13 12:06:13.000000000 -0400
-@@ -540,7 +540,7 @@
- /* */
- /************************************************/
-
--int DnsIp(char *host,char *ip)
-+int DnsIp(char *host,char *ip, size_t len)
- {
- struct hostent *hostptr;
- struct in_addr *ptr;
-@@ -552,7 +552,11 @@
-
- ptr=(struct in_addr *) *hostptr->h_addr_list;
-
--if(ip!=NULL) strcpy(ip,(char *)inet_ntoa(*ptr));
-+if(ip!=NULL)
-+ {
-+ strncpy(ip,(char *)inet_ntoa(*ptr), len - 1);
-+ ip[len-1] = '\0';
-+ }
- return(0);
- }
-
-@@ -572,13 +576,14 @@
- /* */
- /************************************************/
-
--int DnsFQDN(char *host,char *fqdn)
-+int DnsFQDN(char *host,char *fqdn, size_t len)
- {
- struct hostent *hostptr;
-
- if((hostptr=(struct hostent *)gethostbyname(host))==NULL) return(S_HOST_ERR);
-
--strcpy(fqdn,hostptr->h_name);
-+strncpy(fqdn,hostptr->h_name, len-1);
-+fqdn[len-1] = '\0';
- return(0);
-
- }
-@@ -599,7 +604,7 @@
- /* */
- /************************************************/
-
--int DnsName(char *ip,char *fqdn)
-+int DnsName(char *ip,char *fqdn, size_t len)
- {
-
- struct hostent *hostptr;
-@@ -609,7 +614,8 @@
-
- if((hostptr=(struct hostent *)gethostbyaddr((char *)&addr,sizeof(struct in_addr),AF_INET))==NULL) return(S_HOST_ERR);
-
--strcpy(fqdn,hostptr->h_name);
-+strncpy(fqdn,hostptr->h_name, len-1);
-+fqdn[len-1] = '\0';
-
- return(0);
- }
-@@ -631,20 +637,27 @@
- /* */
- /************************************************/
-
--void GetPeerIp(int sock,char *ipfrom,char *hostfrom)
-+void GetPeerIp(int sock,char *ipfrom, size_t lip, char *hostfrom, size_t hip)
- {
- struct sockaddr_in from;
- size_t foo=sizeof(struct sockaddr_in);
- struct hostent *hostptr;
-
--strcpy(ipfrom,"???.???.???.???");
--strcpy(hostfrom,"?????");
-+strncpy(ipfrom,"???.???.???.???", lip-1);
-+ipfrom[lip-1] = '\0';
-+strncpy(hostfrom,"?????", hip-1);
-+hostfrom[hip-1] = '\0';
-
- if (getpeername(sock,(struct sockaddr *)&from, &foo) == 0)
- {
-- strcpy(ipfrom,(char *)inet_ntoa(from.sin_addr));
-+ strncpy(ipfrom,(char *)inet_ntoa(from.sin_addr), lip-1);
Home |
Main Index |
Thread Index |
Old Index