Produced by Araxis Merge on 5/25/2018 9:21:41 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\ZIP\DSM-cif\Direct Implementation\java\assembly\stock\src\scripts\james3 | smtpserver.conf | Tue May 22 13:23:22 2018 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\ZIP\DSM-cif\Direct Implementation\java\assembly\stock\src\scripts\james3 | smtpserver.conf | Wed May 23 16:19:20 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 644 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | <!-- | |
| 2 | Licensed to the Ap ache Softw are Founda tion (ASF) under one | |
| 3 | or more contributo r license agreements . See the NOTICE fi le | |
| 4 | distribu ted with t his work f or additio nal inform ation | |
| 5 | regardin g copyrigh t ownershi p. The AS F licenses this file | |
| 6 | to you u nder the A pache Lice nse, Versi on 2.0 (th e | |
| 7 | "License "); you ma y not use this file except in compliance | |
| 8 | with the License. You may o btain a co py of the License at | |
| 9 | ||
| 10 | http:/ /www.apach e.org/lice nses/LICEN SE-2.0 | |
| 11 | ||
| 12 | Unless r equired by applicabl e law or a greed to i n writing, | |
| 13 | software distribut ed under t he License is distri buted on a n | |
| 14 | "AS IS" BASIS, WIT HOUT WARRA NTIES OR C ONDITIONS OF ANY | |
| 15 | KIND, ei ther expre ss or impl ied. See the Licens e for the | |
| 16 | specific language governing permission s and limi tations | |
| 17 | under th e License. | |
| 18 | --> | |
| 19 | ||
| 20 | <!-- | |
| 21 | This te mplate fil e can be u sed as exa mple for J ames Serve r configur ation | |
| 22 | DO NOT USE IT AS SUCH AND A DAPT IT TO YOUR NEED S | |
| 23 | --> | |
| 24 | ||
| 25 | <!-- See h ttp://jame s.apache.o rg/server/ 3/config.h tml for us age --> | |
| 26 | ||
| 27 | <smtpserve rs> | |
| 28 | ||
| 29 | <!-- Th e SMTP ser ver is ena bled by de fault --> | |
| 30 | <!-- Di sabling bl ocks will stop them from liste ning, --> | |
| 31 | <!-- bu t does not free as m any resour ces as rem oving them would --> | |
| 32 | <smtpse rver enabl ed="true"> | |
| 33 | ||
| 34 | <jmxN ame>smtpse rver</jmxN ame> | |
| 35 | ||
| 36 | <!-- Configure this to bi nd to a sp ecific ine taddress - -> | |
| 37 | <!-- Please NOT E: you sho uld add th is IP also to your R emoteAddrN otInNetwor k --> | |
| 38 | <!-- in order t o avoid re lay check for locall ly generat ed bounces --> | |
| 39 | <!-- | |
| 40 | Port 25 is the wel l-known/IA NA registe red port f or SMTP. | |
| 41 | Port 465 is the we ll-known/I ANA regist ered port for SMTP o ver TLS. | |
| 42 | --> | |
| 43 | <bind >0.0.0.0:2 5</bind> | |
| 44 | ||
| 45 | <conn ectionBack log>200</c onnectionB acklog> | |
| 46 | ||
| 47 | <!-- Set to tru e to suppo rt STARTTL S or TLS f or the Soc ket. | |
| 48 | To use th is you nee d to copy sunjce_pro vider.jar to /path/j ames/lib d irectory. | |
| 49 | --> | |
| 50 | <tls socketTLS= "false" st artTLS="tr ue"> | |
| 51 | <!- - To creat e a new ke ystore exe cute: | |
| 52 | ke ytool -gen key -alias james -ke yalg RSA - keystore / path/to/ja mes/conf/k eystore | |
| 53 | - -> | |
| 54 | <ke ystore>fil e://conf/c akeystore. jks</keyst ore> | |
| 55 | <secret> REDACTED </secret> | |
| 56 | <pr ovider>org .bouncycas tle.jce.pr ovider.Bou ncyCastleP rovider</p rovider> | |
| 57 | <!- - The algo rithm is o ptional an d only nee ds to be s pecified w hen using something other | |
| 58 | th an the Sun JCE provi der - You could use IbmX509 wi th IBM Jav a runtime. --> | |
| 59 | <al gorithm>Su nX509</alg orithm> | |
| 60 | </tls > | |
| 61 | ||
| 62 | <! -- This is the name used by th e server t o identify itself in the SMTP --> | |
| 63 | <! -- protoco l. If aut odetect is TRUE, the server wi ll discove r its --> | |
| 64 | <! -- own hos t name and use that in the pro tocol. If discovery fails, -- > | |
| 65 | <! -- the val ue of 'loc alhost' is used. If autodetec t is FALSE , James -- > | |
| 66 | <! -- will us e the spec ified valu e. --> | |
| 67 | <! -- | |
| 68 | <h elloName a utodetect= "true">myM ailServer< /helloName > | |
| 69 | - -> | |
| 70 | ||
| 71 | <! -- connect ion timeou t in secco nds --> | |
| 72 | <c onnectiont imeout>360 </connecti ontimeout> | |
| 73 | ||
| 74 | <! -- Set the maximum s imultaneou s incoming connectio ns for thi s service --> | |
| 75 | <c onnectionL imit>0</co nnectionLi mit> | |
| 76 | ||
| 77 | <! -- Set the maximum s imultaneou s incoming connectio ns per IP for this s ervice --> | |
| 78 | <c onnectionL imitPerIP> 0</connect ionLimitPe rIP> | |
| 79 | ||
| 80 | <! -- Uncomm ent this i f you want to requir e SMTP aut henticatio n. | |
| 81 | ||
| 82 | suppo rted value s: | |
| 83 | true: required but announ ced only t o not auth orizedAddr esses | |
| 84 | false : don't us e AUTH | |
| 85 | annou nce: like true, but always ann ounce AUTH capabilit y to clien ts | |
| 86 | ||
| 87 | The c orrect beh aviour per RFC value would be false or a nnounce | |
| 88 | but w e still su pport true for backw ard compat ibility an d because | |
| 89 | some webmail cl ient fails when AUTH is announ ced but no authentic ation | |
| 90 | infor mation has been prov ided | |
| 91 | --> | |
| 92 | ||
| 93 | <a uthRequire d>announce </authRequ ired> | |
| 94 | ||
| 95 | ||
| 96 | <!-- CHECK ME! --> | |
| 97 | <! -- Uncomm ent this i f you want to author ize specif ic address es/network s. | |
| 98 | If yo u use SMTP AUTH, add resses tha t match th ose specif ied here w ill | |
| 99 | be pe rmitted to relay wit hout SMTP AUTH. If you do not use SMTP | |
| 100 | AUTH, and you s pecify add reses here , then onl y addresse s that mat ch | |
| 101 | those specified will be p ermitted t o relay. | |
| 102 | ||
| 103 | Addre sses may b e specifie d as a an IP address or domain name, wit h an | |
| 104 | optio nal netmas k, e.g., | |
| 105 | ||
| 106 | 127.* , 127.0.0. 0/8, 127.0 .0.0/255.0 .0.0, and localhost/ 8 are all the same | |
| 107 | ||
| 108 | See a lso the Re moteAddrNo tInNetwork matcher i n the tran sport proc essor. | |
| 109 | You w ould gener ally use o ne OR the other appr oach. | |
| 110 | - -> | |
| 111 | <a uthorizedA ddresses>1 27.0.0.0/8 </authoriz edAddresse s> | |
| 112 | ||
| 113 | <! -- Uncomm ent this i f you want to verify sender ad dresses, e nsuring th at --> | |
| 114 | <! -- the se nder addre ss matches the user who has au thenticate d. --> | |
| 115 | <! -- This p revents a user of yo ur mail se rver from acting as someone el se --> | |
| 116 | <! -- If uns pecified, default va lue is tru e --> | |
| 117 | <! -- | |
| 118 | <v erifyIdent ity>true</ verifyIden tity> | |
| 119 | - -> | |
| 120 | ||
| 121 | <! -- This s ets the ma ximum allo wed messag e size (in kilobytes ) for this --> | |
| 122 | <! -- SMTP s ervice. If unspecifi ed, the va lue defaul ts to 0, w hich means no limit. --> | |
| 123 | <m axmessages ize>0</max messagesiz e> | |
| 124 | ||
| 125 | <! -- This s ets wether to enforc e the use of HELO/EH LO salutat ion before a --> | |
| 126 | <! -- MAIL c ommand is accepted. If unspeci fied, the value defa ults to tr ue --> | |
| 127 | <! -- | |
| 128 | <h eloEhloEnf orcement>t rue</heloE hloEnforce ment> | |
| 129 | - -> | |
| 130 | ||
| 131 | <! -- WARNING : This is Non-RFC co mpliant (d efault val ue: true) --> | |
| 132 | <! -- See: ht tp://wiki. apache.org /james/Sta ndardsComp lianceStat ement --> | |
| 133 | <! -- TODO: C HANGE TO O FFICIAL UR L LATER -- > | |
| 134 | <a ddressBrac ketsEnforc ement>true </addressB racketsEnf orcement> | |
| 135 | ||
| 136 | <! -- This se ts the SMT PGreeting which will be used w hen connec t to the s mtpserver --> | |
| 137 | <! -- If none is specif ied a defa ult is gen erated --> | |
| 138 | <! -- | |
| 139 | <s mtpGreetin g>JAMES SM TP Server< /smtpGreet ing> | |
| 140 | - -> | |
| 141 | ||
| 142 | <! -- The con figuration handler c hain --> | |
| 143 | <h andlerchai n> | |
| 144 | ||
| 145 | <!-- Thi s connect handler ca n be used to enable POP3 befor e SMTP sup port --> | |
| 146 | <!-- Plz note that only the ip get sto red to ind entify an authentica ted client --> | |
| 147 | <!-- The expireTim e is the t ime after which an i pAddress i s handled as expired --> | |
| 148 | <!-- | |
| 149 | <handler class="or g.apache.j ames.smtps erver.POP3 BeforeSMTP Handler"> | |
| 150 | <exp ireTime>1 hour</expi reTime> | |
| 151 | </handle r> | |
| 152 | --> | |
| 153 | ||
| 154 | <!-- Thi s command handler ch eck agains t RBL-List s --> | |
| 155 | <!-- If getDetail is set to true it tr y to retri eve inform ation from TXT Recor d --> | |
| 156 | <!-- why the ip wa s blocked. Default t o false -- > | |
| 157 | <!-- STO P - before you uncom ment out t he DNS RBL handler, | |
| 158 | pl ease take a moment t o review e ach block list. We | |
| 159 | ha ve include d some tha t various JAMES comm itters use , | |
| 160 | bu t you must decide wh ich, if an y, are app ropriate | |
| 161 | fo r your env ironment. The mail servers ho sting | |
| 162 | @a pache.org mailing li sts, for e xample, us e a | |
| 163 | sl ightly dif ferent lis t than we have inclu ded below. | |
| 164 | An d it is li kely that most JAMES committes also have | |
| 165 | sl ightly dif ferent set s of lists . The Spa mAssassin | |
| 166 | us er's list would be o ne good pl ace to dis cuss the | |
| 167 | me asured qua lity of va rious bloc k lists. | |
| 168 | ||
| 169 | NO TA BENE: t he domain names, bel ow, are te rminated | |
| 170 | wi th '.' to ensure tha t they are absolute names in | |
| 171 | DN S lookups. Under so me circums tances, na mes that | |
| 172 | ar e not expl icitly abs olute coul d be treat ed as | |
| 173 | re lative nam es, leadin g to incor rect resul ts. This | |
| 174 | ha s been obs erved on * nix and MS -Windows p latforms | |
| 175 | by users of multiple m ail server s, and is not JAMES | |
| 176 | sp ecific. I f you are unsure wha t this mea ns for you , | |
| 177 | pl ease speak with your local sys tem/networ k admins. | |
| 178 | --> | |
| 179 | <!-- | |
| 180 | <handler class="or g.apache.j ames.smtps erver.fast fail.DNSRB LHandler"> | |
| 181 | <get Detail>fal se</getDet ail> | |
| 182 | <rbl servers> | |
| 183 | <whitelist >query.bon dedsender. org.</whit elist> | |
| 184 | <blacklist >sbl-xbl.s pamhaus.or g.</blackl ist> | |
| 185 | <blacklist >dul.dnsbl .sorbs.net .</blackli st> | |
| 186 | <blacklist >list.dsbl .org.</bla cklist> | |
| 187 | </rb lservers> | |
| 188 | </handle r> | |
| 189 | --> | |
| 190 | ||
| 191 | <!-- Thi s command handler ca n be used to reject emails wit h not matc h the SPF record of the sender domain -- > | |
| 192 | <!-- If checkAuthN etworks is set to tr ue sender domain wil l be check ed also fo r clients that --> | |
| 193 | <!-- are allowed t o relay. D efault is false. --> | |
| 194 | <!-- | |
| 195 | <handler class="or g.apache.j ames.smtps erver.fast fail.SPFHa ndler"> | |
| 196 | <blo ckSoftFail >false</bl ockSoftFai l> | |
| 197 | <blo ckPermErro r>true</bl ockPermErr or> | |
| 198 | </handle r> | |
| 199 | --> | |
| 200 | ||
| 201 | <!-- che cks for re solvable H ELO/EHLO b efore acce pt the HEL O/EHLO --> | |
| 202 | <!-- If checkAuthN etworks is set to tr ue sender domain wil l be check ed also fo r clients that --> | |
| 203 | <!-- are allowed t o relay. D efault is false. --> | |
| 204 | <!-- | |
| 205 | <handler class="or g.apache.j ames.smtps erver.fast fail.Resol vableEhloH eloHandler "/> | |
| 206 | --> | |
| 207 | ||
| 208 | <!-- Che cks HELO/E HLO is equ al the rev erse of th e connecti ng client before acc ept it --> | |
| 209 | <!-- If checkAuthN etworks is set to tr ue sender domain wil l be check ed also fo r clients that --> | |
| 210 | <!-- are allowed t o relay. D efault is false. --> | |
| 211 | <!-- | |
| 212 | <handler class="or g.apache.j ames.smtps erver.fast fail.Rever seEqualsEh loHeloHand ler"/> | |
| 213 | --> | |
| 214 | ||
| 215 | <!-- If activated mail is on ly accepte d if the s ender cont ains --> | |
| 216 | <!-- a r esolvable domain hav ing a vali d MX Recor d or A Rec ord associ ated! --> | |
| 217 | <!-- If checkAuthN etworks is set to tr ue sender domain wil l be check ed also fo r clients that --> | |
| 218 | <!-- are allowed t o relay. D efault is false. --> | |
| 219 | <!-- | |
| 220 | <handler class="or g.apache.j ames.smtps erver.fast fail.Valid SenderDoma inHandler" /> | |
| 221 | --> | |
| 222 | ||
| 223 | <!-- Wit h ValidRcp tHandler, all email will get r ejected wh ich has no valid use r --> | |
| 224 | <!-- You need to a dd the rec ipient to the validR ecipient l ist if you want --> | |
| 225 | <!-- to accept ema il for a r ecipient w hich not e xist on th e server - -> | |
| 226 | <!-- If you want J ames to ac t as a spa mtrap or h oneypot, y ou may com ment Valid RcptHandle r --> | |
| 227 | <!-- and implement the neede d processo rs in spoo lmanager.x ml --> | |
| 228 | <handler class="or g.apache.j ames.smtps erver.fast fail.Valid RcptHandle r"/> | |
| 229 | ||
| 230 | <!-- If activated you can li mit the ma ximal reci pients --> | |
| 231 | <!-- | |
| 232 | <handler class="or g.apache.j ames.smtps erver.fast fail.MaxRc ptHandler" > | |
| 233 | <max Rcpt>10</m axRcpt> | |
| 234 | </handle r> | |
| 235 | --> | |
| 236 | ||
| 237 | <!-- If uncomment this block you can e nable grey listing. F or more in fos--> | |
| 238 | <!-- how greylisti ng work se e: http:// projects.p uremagic.c om/greylis ting/white paper.html --> | |
| 239 | <!-- | |
| 240 | <handler class="or g.apache.j ames.smtps erver.fast fail.JDBCG reylistHan dler"> | |
| 241 | <rep ositoryPat h>db://mai ldb</repos itoryPath> | |
| 242 | <sql File>file: //conf/sql Resources. xml</sqlFi le> | |
| 243 | <tem pBlockTime >1 hour</t empBlockTi me> | |
| 244 | <uns eenLifeTim e>4 hours< /unseenLif eTime> | |
| 245 | <aut oWhiteList LifeTime>3 6 days</au toWhiteLis tLifeTime> | |
| 246 | <whi telistedNe tworks>127 .0.0.0/8</ whiteliste dNetworks> | |
| 247 | </handle r> | |
| 248 | --> | |
| 249 | ||
| 250 | <!-- Tar pitting is a method to insert a small sl eep after each rcpt. For more --> | |
| 251 | <!-- inf os read th is: http:/ /www.palom ine.net/qm ail/tarpit .html . -- > | |
| 252 | <!-- Def ault is se t to 0 (di sabled). - -> | |
| 253 | <!-- You can also configure the time t o sleep in milliseco nds --> | |
| 254 | <!-- | |
| 255 | <handler class="or g.apache.j ames.smtps erver.fast fail.Tarpi tHandler"> | |
| 256 | <tar pitRcptCou nt>5</tarp itRcptCoun t> | |
| 257 | <tar pitSleepTi me>5000</t arpitSleep Time> | |
| 258 | </handle r> | |
| 259 | --> | |
| 260 | ||
| 261 | <!-- Thi s handler ignore dup licated re cipients p er session . So the e mail will get only s end on tim e even --> | |
| 262 | <!-- if the recipi ent is spe cified mor e then onc e --> | |
| 263 | <!-- | |
| 264 | <handler class="or g.apache.j ames.smtps erver.prot ocol.core. fastfail.S uppressDup licateRcpt Handler"/> | |
| 265 | --> | |
| 266 | ||
| 267 | <!-- Loa d the core command h andlers -- > | |
| 268 | <handler class="or g.apache.j ames.smtps erver.Core CmdHandler Loader"/> | |
| 269 | ||
| 270 | <!-- Thi s handler can add a hint to th e mail whi ch tells t he MailQue ue which e mail shoul d get proc essed firs t --> | |
| 271 | <!-- Nor mally the MailQueue will just handles Ma ils in FIF O manner - -> | |
| 272 | <!-- Val id priorit y values a re 1,5,9 w here 9 is the highes t--> | |
| 273 | <!-- | |
| 274 | <handler class="or g.apache.j ames.smtps erver.Mail PriortyHan dler"> | |
| 275 | <pri orityEntri es> | |
| 276 | <priorityE ntry> | |
| 277 | <domai n>yourdoma in1</domai n> | |
| 278 | <prior ity>1</pri ority> | |
| 279 | </priority Entry> | |
| 280 | <priorityE ntry> | |
| 281 | <domai n>yourdoma in2</domai n> | |
| 282 | <prior ity>9</pri ority> | |
| 283 | </priority Entry> | |
| 284 | <pri orityEntri es> | |
| 285 | </handle r> | |
| 286 | --> | |
| 287 | ||
| 288 | <!-- Thi s MessageH andler cou ld be used to check message ag ainst spam d before - -> | |
| 289 | <!-- acc ept the em ail. So it s possible to reject a message on smtple vel if a - -> | |
| 290 | <!-- con figured hi ts amount is reached . --> | |
| 291 | <!-- | |
| 292 | <handler class="or g.apache.j ames.smtps erver.fast fail.SpamA ssassinHan dler"> | |
| 293 | <spa mdHost>127 .0.0.1</sp amdHost> | |
| 294 | <spa mdPort>783 </spamdPor t> | |
| 295 | <spa mdRejectio nHits>10</ spamdRejec tionHits> | |
| 296 | </handle r> | |
| 297 | --> | |
| 298 | ||
| 299 | <!-- Thi s MessageH andler cou ld be used to extrac t domain o ut of the message an d check -- > | |
| 300 | <!-- thi s domains against ur iRbllists. See http: //www.surb l.org for more infor mations. - -> | |
| 301 | <!-- The message g et rejecte d if a dom ain matche d . --> | |
| 302 | <!-- | |
| 303 | <handler class="or g.apache.j ames.smtps erver.fast fail.URIRB LHandler"> | |
| 304 | <act ion>reject </action> | |
| 305 | <get Detail>tru e</getDeta il> | |
| 306 | <uri RblServers > | |
| 307 | <server>mu lti.surbl. org</serve r> | |
| 308 | </ur iRblServer s> | |
| 309 | </handle r> | |
| 310 | --> | |
| 311 | <!-- | |
| 312 | <handler class="or g.apache.j ames.smtps erver.SetM imeHeaderH andler"> | |
| 313 | <hea dername>SP F-test</he adername> | |
| 314 | <hea dervalue>p assed</hea dervalue> | |
| 315 | </handle r> | |
| 316 | --> | |
| 317 | </ handlercha in> | |
| 318 | ||
| 319 | </smtps erver> | |
| 320 | ||
| 321 | </smtpserv ers> | |
| 322 | ||
| 323 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.