From f79c387f3f9e093bd9c8e07a1f332fee7b8c5682 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Wed, 31 Oct 2007 14:46:05 +0000 Subject: [PATCH] - fix horrible oversight in sorting rrset references in a message, sort per reference key pointer, not on referencepointer itself. - pidfile: "/etc/unbound/unbound.pid" is now the default. - tests changed to reflect the updated default. git-svn-id: file:///svn/unbound/trunk@724 be551aaa-1e26-0410-a405-d3ace91eadb9 --- checkconf/unbound-checkconf.c | 2 ++ doc/Changelog | 4 ++++ doc/example.conf | 2 +- doc/unbound.conf.5 | 13 ++++++++++--- testcode/checklocks.c | 2 +- testcode/testbound.c | 1 + testdata/04-checkconf.tpkg | Bin 4580 -> 4637 bytes testdata/fwd_compress_c00c.tpkg | Bin 2086 -> 2100 bytes testdata/fwd_no_edns.tpkg | Bin 1705 -> 1718 bytes testdata/fwd_tcp.tpkg | Bin 1688 -> 1699 bytes testdata/fwd_tcp_tc.tpkg | Bin 1701 -> 1708 bytes testdata/fwd_tcp_tc6.tpkg | Bin 1699 -> 1711 bytes testdata/fwd_three.tpkg | Bin 2023 -> 2033 bytes testdata/fwd_three_service.tpkg | Bin 2012 -> 2023 bytes testdata/fwd_ttlexpire.tpkg | Bin 1716 -> 1727 bytes testdata/fwd_udp.tpkg | Bin 1691 -> 1704 bytes util/config_file.c | 3 ++- util/data/msgreply.c | 6 ++++-- 18 files changed, 25 insertions(+), 8 deletions(-) diff --git a/checkconf/unbound-checkconf.c b/checkconf/unbound-checkconf.c index ba4e20a92..3a58aa759 100644 --- a/checkconf/unbound-checkconf.c +++ b/checkconf/unbound-checkconf.c @@ -173,6 +173,7 @@ int main(int argc, char* argv[]) int c; log_ident_set("unbound-checkconf"); log_init(NULL, 0, NULL); + checklock_start(); /* parse the options */ while( (c=getopt(argc, argv, "h")) != -1) { switch(c) { @@ -187,5 +188,6 @@ int main(int argc, char* argv[]) if(argc != 1) usage(); checkconf(argv[0]); + checklock_stop(); return 0; } diff --git a/doc/Changelog b/doc/Changelog index d024105ce..55b646a98 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -5,6 +5,10 @@ username: "unbound" chroot: "/etc/unbound" The operator can override them to be less secure ("") if necessary. + - fix horrible oversight in sorting rrset references in a message, + sort per reference key pointer, not on referencepointer itself. + - pidfile: "/etc/unbound/unbound.pid" is now the default. + - tests changed to reflect the updated default. 30 October 2007: Wouter - fixup assertion failure that relied on compressed names to be diff --git a/doc/example.conf b/doc/example.conf index a96670758..378f987f8 100644 --- a/doc/example.conf +++ b/doc/example.conf @@ -134,7 +134,7 @@ server: # use-syslog: yes # the pid file. - # pidfile: "unbound.pid" + # pidfile: "/etc/unbound/unbound.pid" # file to read root hints from. # get one from ftp://FTP.INTERNIC.NET/domain/named.cache diff --git a/doc/unbound.conf.5 b/doc/unbound.conf.5 index a3603339b..f05b3011a 100644 --- a/doc/unbound.conf.5 +++ b/doc/unbound.conf.5 @@ -181,9 +181,16 @@ The log facility LOG_DAEMON is used, with identity "unbound". The logfile setting is overridden when use-syslog is turned on. The default is to log to syslog. .It \fBpidfile:\fR -The process id is written to the file. Default is "unbound.pid". So, -kill -HUP `cat /etc/unbound/unbound.pid` will trigger a reload, -kill -QUIT `cat /etc/unbound/unbound.pid` will gracefully terminate. +The process id is written to the file. Default is "/etc/unbound/unbound.pid". +So, +.nf +kill -HUP `cat /etc/unbound/unbound.pid` +.fi +triggers a reload, +.nf +kill -QUIT `cat /etc/unbound/unbound.pid` +.fi +gracefully terminates. .It \fBroot-hints:\fR Read the root hints from this file. Default is nothing, using builtin hints for the IN class. The file has the format of zone files, with root diff --git a/testcode/checklocks.c b/testcode/checklocks.c index 3c56fe5cc..405a406ec 100644 --- a/testcode/checklocks.c +++ b/testcode/checklocks.c @@ -63,7 +63,7 @@ static ub_thread_key_t thr_debug_key; /** the list of threads, so all threads can be examined. NULL if unused. */ static struct thr_check* thread_infos[THRDEBUG_MAX_THREADS]; /** do we check locking order */ -int check_locking_order = 0; +int check_locking_order = 1; /** the pid of this runset, reasonably unique. */ static pid_t check_lock_pid; diff --git a/testcode/testbound.c b/testcode/testbound.c index c7de18150..78b14aafb 100644 --- a/testcode/testbound.c +++ b/testcode/testbound.c @@ -140,6 +140,7 @@ setup_config(FILE* in, char* configfile, int* lineno, fprintf(cfg, " directory: \"\"\n"); fprintf(cfg, " chroot: \"\"\n"); fprintf(cfg, " username: \"\"\n"); + fprintf(cfg, " pidfile: \"\"\n"); while(fgets(line, MAX_LINE_LEN-1, in)) { parse = line; (*lineno)++; diff --git a/testdata/04-checkconf.tpkg b/testdata/04-checkconf.tpkg index 66d5589a5748a63515f0dd9878ef0bfda17bed11..ad37e0925d0b15857bac8a6de6cf13bc9e2c81b5 100644 GIT binary patch literal 4637 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 TtjBu%D~x{tY@*<_08jt`et9RR literal 4580 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 literal 2086 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 M0o#2;SO6#h0Jrl~%m4rY literal 1705 zc-jG}23GkWiwFS3Tqs8X1ML}WbJ|8QUv2!!J z9iSR?iX=klKJIqc!?`_h*?`(^Alr_gfA$qXK`=Be z{? z$lwOnOQnbGUsMYk+Fvgjs-~+-5$&&QI@(`(66rhOe{TOHIFcmTu(~82ks}D$%(p0n zV+vC6t;`xT8eW`hqnnYa~Ltt;V3!?)ECV7cU^!t+g8MD>wzM zsFmR5OVV$>YWJ5@(#hoFX0>XG#bqikY4>|eS~~BP6R0(2Ag*)FK8aARZtgE$vl5q% zw$0@>L1&E=G&g-4^@r1&-O2>*Ch;k5K%8N$xaV9?;`{m7vBr>#=DiosxV>B=#LMzy zHl_L4vGcc%o6qtYIwW2Nk_XFet$9j36RL=lCu{_T>ahyPvFSqm^ zdDyBa%M7>ZZf-hp+yvDBh;bJ(7%`Z6-$ii)=ePx~QrDc)Dx3$QkDac7f>lEV*?lWu)#-ksqHeRjp0lhF%4WVf=(?mE^Mni!?pjtwpgW5qp>ICEv^)M)-E zRIvJhkP(I4N-HZN!Gz*lsmUU~ck=g|wU&X*ZDCZx1BT}OV;hLICF7JX1!*0IH4V-*Vgw=cB=d^S9m|Ji}{ zBrzT<@v z;vzn=z^DA=n>*nc&rE1GTGynG$1tDNFhgY5n^Cwj7f>jGs+CovT+*Q4yzT*3cm}yL z9XG^3>X*UxWw?>+at*(n-`$ak`~y-)E+ghI%0TLD>fzbxhGkNp+70Sa*A5WB8oj0y zuS`1r`fKo1mULJUZeS5ZdUO*VU8S|zrwhC%InNGWoYXFp3)7j*kn^{Bsy$l&p`xBb z#;*9+i@g5V4P7;iBFC!+ZwVaYe-E&w{$o5b+hYZok&>2tkIDG#(vQD^&0v8Oj zo4XJ(Lc*Ohnef-f9YjM(g|s|LOOXJhJ|?D=Okx@(^h-ubLbPI)$>O)L%TVvJj1o;{ zZ->oe@gLWBUoK;3{HuC${~JoNpz`=HBI*$Tdw?_GHDOvcM%@=)dgt2R%O5UVKtGvN zZ$h!4oysKF>%D=Zt|){wTUbpEUNvzJxvKT*uYq|MvnhNC7ao3crqFM6pwTAXX6Ma2 zc-w_q4KCW+u&5u}+$(tfLg?Ti3JQ_h}tBH`HYC(JS@<0vKa zV6FdnZw35?Tq&TRL`P`KocEBD_FEuE?Yp#D6Fp>lDXS%8YTbe926O6*yrUa;$1;b8 zn2Jf8P4Uw9Pa>g{fTqta76Qj5?JM5Y-AFJVi+|q5dS_ zH-DK3_<73$C&YrgK!hW3XHzL0V@b~oY?TPSmsp0V5l;lv#fV`nN-;L+vJ(MASqc^b z`f?duMg;UIYK2i1FB8EU`;6gqQH*B#Zq#?+Pd1ZW7D^vx)L%%;kc)UEEmG+Z=3)&l zBx^7{g_L62wvQ;aV8{yosNcu`4-mi2g8cvoIKTl8aDW3G;0xg&{CEq604M+ev!hjY diff --git a/testdata/fwd_tcp.tpkg b/testdata/fwd_tcp.tpkg index bef8747bc560fef3c741136041fe64ca4d3c0485..953ea18d766e2e45d732ee693df9e4e65358fe85 100644 GIT binary patch delta 1512 zc-jHz1sD354WkVPABzY850a4vHV@;r`hYblYb28z0U>|dCFxAgZ&ssHEDqCgNawnr z(vp5hoItG!19_ce_DhCZ?f(4YF)MLNYg1ot6WpjmL37i$QGeLI)jOTqZlLfkZa|z- zthi@fPx8<6iDOM5C;I&?A9H)TM2d&yCu~OZ@utoX9XFrlGjd2g3KS30X{Ea)?gcgc zR;O$XM(uw5R}6|I$$6U%Y(NxBp+7HSX;MJrWuGoQu zGT+UrOmg^W zUkSf~6PyB9t830^4Nij4M_1yV=4NP3YGf3-R_HKS@EOEB29fvt1^h;&%lh|&>+Yc6 zdv~fE8j)`57yUv1b+2`GTEI^(6Xmv^J-G}*9{6syW+E(M$?my*MW%t=F^nzzT;!acj<&B?e4 z-e;$BpWRigEi^GowH+H=7RHKuCOC6t=XBBk11ea5K**RvZl#r#kYGx2Rr+!epF8E^p$JJ?4LhhkUANOO>n}3KBPzKN=#h2~2kCMsZhS z-?Nd}M2p5{*cAW8=lj#icqIPA0IG(C)N)y-ttRo8Met_3;q$76Zp7SFJ|> zqSJ=A*R3nwAoKZLx@b%Flu~bB-L!fsUeYzy(A0va7PaL}TJ7fU==mqG$^Y%ZdQusW z`G2ukPW>O>BL6Gy^1rRXD>I;Nbk-GW5)zZ|s2^ZBSOs0xNRtMZ?|7j=lSu>~e;?2^ zLuA{ZL~u@r053r|s-;S`@DduWJ{Y(M$ffDHA^uUn3bwDpjoMJ__;P-6$0mvjNCTOS znZKw4X|S1xVU!zINn>U=sYhKqK>Vupnohkc>H4eH@QjvpSrBG0_(l3OixQD^J^FBt zM<3_Y#kiT;RdQ}R(+IhJ!6(Z@fA{}W%6QEGD;0g^{}ti?29kIFzXe#Y|HO&e7gPbt zrtABde~R^FiZ3`(J1&GIb((zg(8GX z1n@j^nSuwhNa2%&O?+hXsnw7PwQlib4d&FBc~vLQkTYSAoQO#h&Uk3&3tO4cX+V?j zHm0;3lW+wwe?KMTFFXEz?ClFAB4dms*xUud2nn~&bjp{EGZ0NhhonTAlp_PY_G4l~ z$rPqUK`&*rbl?@MOciefyA1Usmg}y$71-qeyn^|ZG9JzU#r>cC|6j>4cKQESAkO@& zM8fBg1x|>Own3zQaHE+LPB4_`k+n`FUQeuoD9E1?e+iW_W_TehOZ2kRjugDnm0%Iz zbyfwJ5eYXIwL%fWtH{N%xqDYZPVPO#;QeGxe8!NGEDH|4D^e2vWi!QPq4GYW{z6G_ zWWjq`K~;XmtN>TA9D}#Flu%6D#>_(2jf$$_kAAlNhryZr1&8!I*uf5Vu!9}!U&h?rA delta 1500 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 COIWo4 literal 1701 zc-jG_23q+aiwFS3Tqs8X1MOMsbJ|7__gCFtv5^@&8COCQuL(Ac3E;+U3Wx`Q}hU-kN>@UCj*?`x2TR4NqW z?_z%Cdro`0R?-cvP&9OHPt$XGt*{4$ud)1792dkGnT~mbCOtC<9CtW3wYp%%%8H1PPPbW+xoK5KYc>=2BSh31F_5cZ zJ42XGrz-tyPP{QyEjGcqoO?QEmN_0V?h+3&SFKm=t5&1mX?J^fR=~fgl>(*-_s~MQ zWri?jL(U6i!mrTTDsn(vMD7iXT)|i_8ByyNOgETPUnb4~hCcN`)-~18)SRZ~4LLD$ z%7)06!H<~En$fu?qlreQAkNII4PI>B|5(%9#WLS;L zoZY_a%_UgQN-zsBpUdDfB4JihD`YJeZokt^Cbgid&s8!WxwliD}zDvUH=QYWPn-J?*u{hGaq>cft=$o9o{WtS7SZ zSpDbo#l`bq*9~6(hF;p$|2F8A8PJxfr)B8LZ`2PQ=3?Ee8fnnL@*OV}jI+4jz^9=< zYHx=R}cwBq}YiI|m5Z#E;!qszlCh`#r;l{LXhd$@5z{(6>WRs~1 z{yb>Y->;_8W;dI%W|8ARSsqI%$D4nukST!oV$ z^s%7$q^TKNqbeChuEn3=LQg-|(T}|6FW?^{UDST>Uv>Ju?z;-&G$LKs&U^jd>u&S1 zlG8*V4p?B=6jU@g=HGBqfy{DM%se{6qQjw$z(7h;6%#e1^AaA!I5&gv78%v7O+RJb zXgp5RR+__F8`}ZEeR3-q{E)fm2K$fOV;o`TE_HJ;=E2AGR@T*B#@@mZqgC6n5psmF zna9GynncSY0Y!Wc-#BBN?UwN*RV^^MTO z?|pM2NY}R|{?H0VfLX3z5GM!GP^OjUwNNTOi>t=VsmzFO>wfSb6t;QGb z3o+};zP`$)?qTZpF^%;0w;%rp@E_aO?>|MO#OuFQ)JvsYUcCR!7mB<3-v-^qe{9RY z|D>!WknbTIUkv^B<6nDbC`85BV6mwSLJPE4o=04M+ehlN{p diff --git a/testdata/fwd_tcp_tc6.tpkg b/testdata/fwd_tcp_tc6.tpkg index df45e9e5b4d96cc74274bd1a3002d38cadfbf790..b25b94e4d91070b84139cfdf1cbe14c9669d35b4 100644 GIT binary patch delta 1696 zc-jG=24DH34X+IbABzY850a4vC4ZHr15|@f(Mcin@!z|r2MCPqbYhcf!;X>ecJFrY zc5hd^=i$s6_@;|LU9oI0xAz2~B9zOe=&cu5-ZAWHYFW!`_$-$9RIN}_3wuy{ip8u$ zzwoGnMK4oG!=r{6 z*fe}(dCnZ@m_BGF(A0|hE&f3Roe9v+WpZxVj*ma;RlxETxKbKQ9bfkE&d5L+oHUTj zh()CuiqPQL-2EMiEXuA@Z&B=z9q zDaJs-vukiptqM6c?0-psoWFpBJ~7g2f)B)Q+Y1v<(=m?t7j*hZvnT%$-AUD0+%v8dGvD}Pc}NQCs-%|W-*>sPbS zpF_4+Z#O&Va0I17sR%D#kjwU~&gEiAGMJoREoUvTI8DPToy-1$mW(?R1Zs{MNUI#v zJqc>H_4P$_mg17urm?~%cvwRPi6D&n!{M!7bz(VOjJGo@2 zjDKdr2x>7pt)s;@(t27!raBw-Wg7kl9nK6pa-k%tXE0(AxZi{>1TS$3LbW0juE9(0 zd+1eS(9H17ag7WE#}r@ikk26EF$mn}FW^s-Ij{dTxaSWt3rrLT1=9FW{ z_NeKH)t!RuZA*NWDj+2h1u+Oz!c1c_4$C|g zMB-p7|ABE9_ZCmWZ*(T17?y=)r&OtECx3C~aPn0~tB3A?A4A4N{$JJ$i~Ap~kQe^1 ztL2^lZv$@Ee^EB}KdJ!JIr=^(o#B2`#a9i}y%Ef2GbMf7EfIk|!2l5!K!xp z`C&2|_+inKuoWp|oNaR{%+{0KEbOFGr{$C}HE+Oh_>6jzsO6$$ICWhtC1R4?GJl%d z`9UId!fDcPWA-X=akeVTITAM2)gX88{SVuY|LX;H?f*Zzp5NX7ZUr{n|FA9le@aT? z@b}61WXIo+ynT*DWQ-quHgh0kgoGP=G7;Ox6@*P$gXC@^xrg8Z4h@M3B~^`vRs4cc q?8-}4snUG|yA<^n%S}$YgB|Q(2N65i!47uti0}_zev^^_C;$LuTVb^T delta 1684 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 M0CU}zRsc`{08=3Ik^lez delta 2020 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 F007~b^r8R& literal 2012 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 KO8todC;$Lx@m7ui diff --git a/testdata/fwd_udp.tpkg b/testdata/fwd_udp.tpkg index d3c3986662c5ed3c2a7832d3d96b0a561345c4af..4dde7181d6a4c426ce954e56bea8152009581dad 100644 GIT binary patch literal 1704 zc-jG|23PqXiwFP@k|;+21ML}WbJ|AGU%6kgkr_J~S3=@B#W7<7xN#c;!MJXw?NA{d zpc-_FP70xq|K7dR1L5Gh?Kn=GvWd~@_HOrXU$=XjEbUQfdz$U|g}sjiIzp{diJsN+ z#xsUJL$4V{1AlA!o^BLt#nK*BKGuS=5c0tE0rr+G45)wixcl(`QJ7@(pR_%nJ}3{N z;A**im;Otrc+`KTX6SmQS~F1p6}?*B1N}i)aR>a*^}i4MstOs+tLi@42hKv@q7cj| zEKH6Yhj%EYi8H6LoKY8?;E)TfPs#V7PC(NNTHxJGH5{hJGk%1FgM`o)JaP#+V$$w_ z@&G2x2ge23#!kl^BTLWZ+;OKdtIY`;TsBaI47%-6zc(138jaiQi{`A^C9Q2^ zg-*~=rGS>EZ=?KhcxP}jw_UD^AucD*Bof>cAt&Xh<;<~WkeB0rQjUebT#}2X6=rNf z3z1P5#*SOa(wR6Ungyx{>9SHQiAF&K-?cfLLa}jRz(FLp^Y%&pNp@$VBW~QWuZ4L- z!D8;jnMw;IoZ6sLIOK&>!S{#L!r_K24-1D0e%MP#B+JZTQClfG(VRd(Pq!l2LIc9F zY^6dD-7yPYTUsKzz}U2IroQMQ{XyqM5!S3JB#$qJWT=Y&t%MLX;_j?`(k*0Vw9%P) z*(xi`47SK`X*!YLaO%H9zY7>l8HC;!(r@57EY=z&Ng$zISfwqIc1>5pJ5y2jk z$36LYQ2Te8zYniN_&S{RN{dZXuq7Cvz^rn6~X>7Z#M7 zj{l6)IAb{7MXCt4)_*A9hvade|5uA;^#5wDYSe1wVo~^iNiXmG|1scJ{l`RN_J|c= zhD%cN{TYwHT>6O}*bG*PM8X&e*wO__2oX2Vd@i<(E09gqfTTo8$`KyoP>D=1nZ#5k z^eLe@j;%>$viL3JGT0AD%0yFt)WEdO|D*cu;dtD8{u|={uTm{yqg)dAf0e3U+4=ut zz%htZGpQWq4U8zk^S#0OSLa=z@6Clbrx6W=SW%5$bZ`v0XbxL1 zfq53QDZC9<9{viVWYFoqdIPTq&}>4t*BK0Y1JZ1NeRVm+0>oR59GhHrTEp{R7hYd= zE=7YZm&@FFH`h!t&Fe|0!(qf16tm%Hux&FPCev z|LbU7C3*i_+4=vYzzdVpuFRWb?UQe*&mHDs(y!^HO}XVeULZTpqNEy37p~fU@J#E5 z2KZ)!PlM2R@!`!^8fjtGAZE190O?*+8_wt$pa%Mvb={~JE70l;p@>F6E=8G8`Mc_VYjJAT~VBnb?YUadv((H*V_?S z+N3WFhHR2UhBVtHbB1R4{tRQEpwl-wr*@s3na&)K?)v8&UhX>oACkv?{$HzB((}Js zk^Wz-89V=f4A{*7ql?+k=nGKxx?WZUNu?2Azc;{krhv(Xmd$h&B6?5L%Le%wB>M&8 zgBkD}Ql)@4BGadYxVS@(uiv>MukVw~TKST>OI=TyQR@bSDqm7x5npto+wn}=qa7(3X(4tB7E9qiy=2Y&!zGVx6SC;$K_^Gw|U literal 1691 zc-jG*24wjkiwFS3Tqs8X1ML}WbJ|AGU%6kgkr_J~S3(l6DK?A=;KpqX1mn7ywnKz; zfNIbwdW6u&fA8MufpBo#b{wZo*~I8{d$)VHuiHIMmewe=T*b1z!rmtW6`@)#N6$)W z;~B%ArdBmwEmw5CxTk7*RWI*B`BN<@3!xtv9>Cs`g#q>M9(N!9KMIqK{*$)r(Ff(h z62t8xvHsX096h3UsfxXJy0KX6?ee@T>ty9FUye8ye#jNeehZ6nG}K< zg@xhc#^D`GX=2YQEN9dKJ2>+x81vdBPbWk zC3yCXTy>xKuF@gNU~+c7o|X3EG!3Wpu7)Wt8F$1H)SNMpHYsM`Bxp2luP>UjW|y?K zjpaH)LlpvA8lHvn!{MDleQr6v%!fEWu_uw>o^UxyZ=RuYYZ2EHqEHU+(Lpus^TxAS&A|0KIJ-VrzM*w@0i zp{lZ>ApaA^kz8E^%vCB$CIMLNZjw|7Jo68gX}4KIs;+GTP|O zylj<~X#`v3w>0d?Z+z;#L%$0cOc{jkSHf@L1ed_Y>KF^!fD=FP(3SY0r4g932APD8 z8Q9DbbVd=4QRqH>2EUQqMe~QzRev-bysqQ%Omf%F^WkXtV$iv)7x9&IMb`?vRb7Q+ z{)Ce{(DrlKHmL+OJl(gwrCQn#|Z6n4)h!ia2>-pMU%*ph#17Bc+Y2igw)7HrG^cm#V$ z9{1#bYOz$zDTV_NW;!59vx6SIwEnSP->wsK-yG=*?m> zMqv4ENWGOjXQnZqF+UJQ;!r97icu7o8qdKKIG11y%kr=b3r9u8f7)rB8JzAS(#K(I z{fBaYNFMk3e?>2$|5vINty(Rir<)zZ%Y9|LaHe~c$)k5~a_xFjXt$9VkZ(vR=J zVz5Fa62=I@mJSF)h`6!mbG~ImpUs20D|9=cP27a0*m7}Z;<73nLF?1nklB) zy}a%W(*B&LD!Qr^Ri&iHtLSvwyF>n;!Z!c6eDgth+~@zLQZ@E}6|Ji%?tjZW|9=#C zZuqn-^66On0VO{&gdAR3hLK2RjcV`Xmy65qY;n`!*&Av!x986Pl0Qtr8Mzj|Kdyy z^UCYwJ$fk+;#pxB#-<2zgj7$=YORv{9mtXJO6(S*v$W< zi`g&e3sCmDUQ`50r4e7hH^8!|fXRiD&2%Kfdr#9#2=N&t`vu~I8Spz&rGPdf(x-$t zzeA3%-+f73-zS%~;w5vJx}Gwl<_!i_e@Q)wf6<9<$1`b|{?<7L!K26@c lECAjYUtjZ&I-jG!*uf5Vu!9}!Uchrootdir = strdup("/etc/unbound"))) goto error_exit; if(!(cfg->directory = strdup("/etc/unbound"))) goto error_exit; if(!(cfg->logfile = strdup(""))) goto error_exit; - if(!(cfg->pidfile = strdup("unbound.pid"))) goto error_exit; + if(!(cfg->pidfile = strdup("/etc/unbound/unbound.pid"))) + goto error_exit; if(!(cfg->target_fetch_policy = strdup("3 2 1 0 0"))) goto error_exit; cfg->donotqueryaddrs = NULL; cfg->donotquery_localhost = 1; diff --git a/util/data/msgreply.c b/util/data/msgreply.c index ea524e924..14196837b 100644 --- a/util/data/msgreply.c +++ b/util/data/msgreply.c @@ -421,8 +421,10 @@ int reply_info_parse(ldns_buffer* pkt, struct alloc_cache* alloc, static int reply_info_sortref_cmp(const void* a, const void* b) { - if(a < b) return -1; - if(a > b) return 1; + struct rrset_ref* x = (struct rrset_ref*)a; + struct rrset_ref* y = (struct rrset_ref*)b; + if(x->key < y->key) return -1; + if(x->key > y->key) return 1; return 0; } -- 2.47.2