From nkinder at fedoraproject.org Thu Apr 2 15:19:50 2009 From: nkinder at fedoraproject.org (Nathan Kinder) Date: Thu, 2 Apr 2009 15:19:50 +0000 (UTC) Subject: [Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.13, 1.14 Message-ID: <20090402151950.6777A7013C@cvs1.fedora.phx.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/wrappers In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2137 Modified Files: initscript.in Log Message: Resolves: 442474 Summary: Ensure we exit with the return code for the status command in the init script. Index: initscript.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- initscript.in 20 Feb 2009 00:14:34 -0000 1.13 +++ initscript.in 2 Apr 2009 15:19:47 -0000 1.14 @@ -312,6 +312,7 @@ ret=3 fi done + exit $ret } From rmeggins at fedoraproject.org Thu Apr 2 22:28:07 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Thu, 2 Apr 2009 22:28:07 +0000 (UTC) Subject: [Fedora-directory-commits] winsync/passwordsync/wix PassSync.wxs, 1.14, 1.15 Message-ID: <20090402222807.54B6D7013D@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/winsync/passwordsync/wix In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20015/passwordsync/wix Modified Files: PassSync.wxs Log Message: Resolves: bug 490048 Bug Description: RHDS 8.0 - PassSync - Memory Leak Reviewed by: nkinder (Thanks!) Fix Description: PassSync requires msvcr71.dll due to mozldap dependency Platforms tested: Windows 2003 Server Flag Day: no Doc impact: no Index: PassSync.wxs =================================================================== RCS file: /cvs/dirsec/winsync/passwordsync/wix/PassSync.wxs,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- PassSync.wxs 16 Feb 2009 22:37:32 -0000 1.14 +++ PassSync.wxs 2 Apr 2009 22:28:05 -0000 1.15 @@ -203,6 +203,11 @@ + + + + + @@ -225,6 +230,7 @@ + From rmeggins at fedoraproject.org Thu Apr 2 22:28:07 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Thu, 2 Apr 2009 22:28:07 +0000 (UTC) Subject: [Fedora-directory-commits] winsync/passwordsync package.mak, 1.2, 1.3 Message-ID: <20090402222807.6E0207013C@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/winsync/passwordsync In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20015/passwordsync Modified Files: package.mak Log Message: Resolves: bug 490048 Bug Description: RHDS 8.0 - PassSync - Memory Leak Reviewed by: nkinder (Thanks!) Fix Description: PassSync requires msvcr71.dll due to mozldap dependency Platforms tested: Windows 2003 Server Flag Day: no Doc impact: no Index: package.mak =================================================================== RCS file: /cvs/dirsec/winsync/passwordsync/package.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- package.mak 16 Feb 2009 22:37:32 -0000 1.2 +++ package.mak 2 Apr 2009 22:28:04 -0000 1.3 @@ -51,6 +51,7 @@ copy /Y "$(LIBROOT)\nss\lib\*.dll" "$(PKGDIR)" copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)" copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)" + copy /Y "%SystemRoot%\system32\msvcr71.dll" "$(PKGDIR)" PassSync.msi : LAYOUT if not exist "$(PKGDIR)\Binary" mkdir "$(PKGDIR)\Binary" From rmeggins at fedoraproject.org Fri Apr 3 14:28:35 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Fri, 3 Apr 2009 14:28:35 +0000 (UTC) Subject: [Fedora-directory-commits] fedora-idm-console/win Makefile,1.5,1.6 Message-ID: <20090403142835.79A657013C@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/fedora-idm-console/win In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28405 Modified Files: Makefile Log Message: fix typo in Makefile Index: Makefile =================================================================== RCS file: /cvs/dirsec/fedora-idm-console/win/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 11 Mar 2009 23:08:27 -0000 1.5 +++ Makefile 3 Apr 2009 14:28:33 -0000 1.6 @@ -58,7 +58,7 @@ JSSVER=4_2_5 JSSVERDIR=JSS_$(JSSVER)_RTM/20090122.1 IDMVER=1.1 -IDMVERDIR=$(IDMVER)/200900310.1 +IDMVERDIR=$(IDMVER)/20090310.1 WIXVER=2.0.5805.0 PLAT=WINNT5.0_OPT.OBJ From rmeggins at fedoraproject.org Fri Apr 3 16:06:21 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Fri, 3 Apr 2009 16:06:21 +0000 (UTC) Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40 security.c, 1.21, 1.22 Message-ID: <20090403160621.0BB547013C@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7989/adminserver/admserv/cgi-src40 Modified Files: security.c Log Message: Resolves: bug 493989 Bug Description: Admin Server: valgrind invalid read in security.c when installing CRL Reviewed by: nkinder (Thanks!) Fix Description: security.c uses strstr to search for the begin and end crl header and footer. This assumes the buffer is null terminated, but it is not. The fix is to null terminate the buffer. Platforms tested: RHEL5 Flag Day: no Doc impact: no Index: security.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- security.c 10 Feb 2009 17:49:46 -0000 1.21 +++ security.c 3 Apr 2009 16:06:18 -0000 1.22 @@ -1560,6 +1560,8 @@ memcpy(ascii+asciiLen, buf, size); asciiLen += size; } + ascii = (unsigned char*) PORT_Realloc(ascii, asciiLen + 1); + ascii[asciiLen] = '\0'; /* null terminate string */ fclose(f); } From rmeggins at fedoraproject.org Fri Apr 3 16:10:25 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Fri, 3 Apr 2009 16:10:25 +0000 (UTC) Subject: [Fedora-directory-commits] adminserver/pkg fedora-ds-admin.spec, 1.5, 1.6 Message-ID: <20090403161025.63E8B7013C@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/pkg In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8370/adminserver/pkg Modified Files: fedora-ds-admin.spec Log Message: bump rev Index: fedora-ds-admin.spec =================================================================== RCS file: /cvs/dirsec/adminserver/pkg/fedora-ds-admin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-ds-admin.spec 31 Mar 2009 17:59:48 -0000 1.5 +++ fedora-ds-admin.spec 3 Apr 2009 16:10:23 -0000 1.6 @@ -4,7 +4,7 @@ Summary: Fedora Administration Server (admin) Name: fedora-ds-admin Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://directory.fedoraproject.org/ Group: System Environment/Daemons @@ -147,6 +147,10 @@ %{_mandir}/man8/* %changelog +* Fri Apr 3 2009 Rich Megginson - 1.1.7-2 +- Resolves: bug 493989 +- Description: Admin Server: valgrind invalid read in security.c when installing CRL + * Tue Mar 31 2009 Rich Megginson - 1.1.7-1 - this is the 1.1.7 release - added man pages for setup, migration, remove commands From rrelyea at fedoraproject.org Mon Apr 6 16:05:21 2009 From: rrelyea at fedoraproject.org (Robert Relyea) Date: Mon, 6 Apr 2009 16:05:21 +0000 (UTC) Subject: [Fedora-directory-commits] coolkey/applet/doc CoolKeyApplet.odt, NONE, 1.1 Message-ID: <20090406160521.126647013C@cvs1.fedora.phx.redhat.com> Author: rrelyea Update of /cvs/dirsec/coolkey/applet/doc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1041 Added Files: CoolKeyApplet.odt Log Message: At least some version of the documentation should be on the public CVS server. --- NEW FILE CoolKeyApplet.odt --- PK xK?2'?????G)?5?????B?*ok???\??LdPK?x?? ???}????i?"???uH???p???l1>"??????]?n?????????????????,?L1?E???1? ????? ???9"Gc2????1????F"???60?????k??????????t1^9?'???|v?????? E????k?3+?5= ?b??o???oc???C< 8?s??Sh?? b?q?>??x ???E;L?m[??!?? ????? ;??3??6c?:????O??g??_y>????SwL??0???K???=1g??}??C????}???X??Nn??????????}v,0??F?????????O??'?=?_???e?????f??-P??V??g?>"?F~?6ma?????+3h?p?:????????oWB??u????????'u??O???f??^`??????nC?t?j????=Z??M&?????f???K?? ?&??|?x-?`S????????????oj??,$????R?r???G#b????O?p|????=?T ?%???=?i???J^???? ?`?????h9????h???f?r4?????OM???}?u??????U;??^??Ni?:?s???QqL???????no ??o,??q?u95_??`q??O???F:?h4?U??8)???J5?W?Sk??????8+ v? %??I?21?NC?????n?????:o!?R?WB?+B?+B?+B?+B??B??B??B??!????u?-?P?uEuFQ???C(?7???C(Ue?AB??Hj????@??@??@??@??@??@??@??????????C(o)?2?C(?3???oBy?!?AB?*c? ?J?GR???|?1??L@Q#???FPT?? P???(?) [?u8???S?l??)???2DAP?UIz?Y?G^U at EW'???P?? ???Tte*?2]???^Tj?HT???7P????????\T^q at E?*U??2DAP?UIz?Y?/??B1??x??'?j?9HG????^???I? N??&`??;??6?W?F??{??RK???Fid* ?4Z?N?D+???0?Rj???04??) ?v!=?=c???????9????e0?ee?0R?b}???>?????)?&??3R(5??{'S?F??.??H?7?V??| V?????5}??D??}YYR??? ?**M????=?T?Js??V??(?L??? ?*j?r??| ????Oaju?;?T?f???,?????>?W?6?U??????.?z=?Yz???Vc?tw?-?%? ????.X?h?M~???"??????cV??}?,h?)???zV?????^??V%f?t???U|???X?&??Dg?\?????Pb????z q^A?\??????0??tV"VMK?V?p?.?jq ?6z??Y?*?(u8??[?Y?? g?$??`???,?????f??C?????A?^??%?O??JNNq?@??T_??Tg ??V"9U? ??&??urjI?~????I??{??????*b?y??M?5?i?l??)????A???~'E?iP@? )????`)?;q??1h??.??|"??F*??I???j?!???Jepv@??T??u*SqNQ7? ??:????TIz??z?f?????2QI S?f???(/Aa???,Eafe?F^?]tQ???w??? ?s????LsKK7[??[*_??.bfiZ??]H?n:? ???q(e0 ?GWs,??c0 {???tR?p F????T?^e `x???y+?4gd???>'?T]P?4?P?ge?~VF???2T???????Q?W??l?vO?R????2M,??????)b9=??Y ?9?z?[?b??U?????+???Up???X?}???i?Y? ???g)f1S??)?z?Y9 ??z?d??&?KP????R?^e????0u??^+?R?^+?$ ?5Q???? ?3????=?"????0?????,j????H??.`paE&??[?%x??Za??0?Ls?JV?Fc??F?????F1s??i???z?[)Z????%Y?????kM???V??????16)?f1?l?i?z?M9Z??e?d??&?K???,?r?p????R??l)?k?j_???k_3??oM??p?a?k????VXk???hM?E??x??????D?:??CE?5? ?k?Y???T???(?kv?5;??Y?????f???;?S?1? z|?4$?+M?1?)?^??y?F8?K?BUW$UT??U?{~???I???aY ????t^L=???w{;E????7?i`)F?w?O??????hp??? |k?? n?? ?????5x?d?????|?n ??*H?RXE?????VB??j ?`???[J???Z????3?Y?/??HPU)??E???t??7!V?.?+?4 8???J?]+?}?Zi?Yi^?l??????9{ /?? ??G????t??7o??~ ??????L\] t? ?#?G? ???3m?{t?NMg?P???M???(N??? E??X/)]{L?E/????????o????zgb%????-? I\dO??W?????k????-? ?=??[?#?G?pp?6?U????s??&/?u?#?? ?b??MS|??P????R??? ?L?9No.6?[?/F4???Q??R?j?QjV??S5???y `?ly????n?U????S,OR?0E[??????07????Cre?/?????????F?i??/~qa?w?YXT?_?;Zr??&?lk [?V?t=M ??+[WX ?X?????????? 1y???-? ?J?8n????1?*1?m???d?Q?:g??X?0?HNo+? ???$x???;?[hi?? ,+k???d*W???q?r?z6 ~???)????M????V?q??????@?y3?_?Z?-?Jn??k?OO??Zd?U???:6????[???4I????Y[t???&Y????EA$?/6??o?????\??H?+?nE?R?v???????g;7????ff?T?`u??>?? ????MO,_L????LV??~f???$?bH??X???b-?m???e?^?nV?h?:P???5?6????r?2S??L?^f?bPmzf???=8?o ??????Z9?r??&i*?????cJ?D???]o?-?/6??d???6DKcM?c??4??c??V????2?e???[;?K)m???f???$??wL????h??? Q???J????^???A}~?Z?C ?k d/????h)????OE}C??GF????7??"v???????Sp ???}?.?`??{a Y.???d9??TNC??TSJ????7 ??X?? g*h? ?6c??*???s??>?>9jn?Zm?????1??3=??G?ZW1?\?-U???H7?8*??????^??M?(P??Wk??????A?f??M???D;??9??b]?2?H;?(??P???{?????????A??b]?2Q'??|?l ???y?&??-??d??????|xy #??????????g9??&???7?m?e?o6]R??????\v????F???J?M?*???yE ,??????ct??.??Q???p?T??geX?2?|l?r??'TR????%???*??XoV????G?_.u??g?6\*?? *u?*??*?[j5???E??n?`B????""+9A?n???x??g?8n at 0?t?2???A???$?1OG???? ?????*?7+??.D?bU???*;d?9???L?-????(G???-?~???h}5ym% '??L?mN?l???*?Z ???u?%???~??x????"????b???7$+???;???h?N?z??*d ?????jD??N?3??E?????=?3??K@????AT$?? s??K?`??? ???? ????6??M\ojb 6?????? L1Si>??gk???v?0?d`n????/?m??)a?? sG?NJ?{????????~?0?d`???y?/?}???`???x ? ???a???I?????{?;??kt?%??,?????;,' ????z??/Y?&??N&???? n??????b??O???h?{" ^R Jt[]??C[ U??8Gk???t=??????`???g?O?Y?B ???9??????G=9?C?[8k ???? D?^Y?pT{d ^!?-???uQ?s=???8???LXs???Z??1??? r?9???B?t???.h4>?8]?????? ??? N!i??????)?0???=???)i??h?e?>?F?????1???\????tH????~??????XC&?oG?L???0X=?????j??? ??53??N??h?'o{????B?$2??1 ?`_?? ???9;?: ??~?tf??f?6My.???A?v c ??8?+4Efg???hN[M^?`?o?6??%??Y9p??,[? ??H?9gj?#?X??????'D.?[?B_M?? M????????????#?@s?????4???P?[??c^e? ??%???X??tQ????????t?K??!kP? t?=???M????v?? ?6???\a???0?Ca[k?/1:????7k:?2TM????A???4? ?>V???????"6QZL>?s6??????A?>i??????y?-???4??L??????"(N??$?? ^?9?U;???=BX??vV'h??(a??a??r??b?p?0???,????? ?????f?? r!?#???F???_4V?\??5X????????9???v???-?)?H?P?L8?p?{? ??????+?`h??I????5??????S?s???? ???????]Yx???????????v>?q??}^Z?`????|>?W???#>????x???A&??_????_z? 0? ? .? ???fc??xR;?K???+VF{?n,'??^S7+??e;?n??,??y?V?????????u?'9u?+D_Ic??qy???9.8???-??x??;???Y?eR2F??Pla??????5W????????]?BCM? ??V???l??%?iI??Z9???!}=?&???:%?7??qB+????m??JtI?z2?CV??J?T?6:o:?[h???}U?.????\?w5V??PP+?e? ??D???w??????y?ur~*?????y?K????gx?x?.b????=a^ ????T??h?+???9?G????FRax?q?) od???????!F? ??x??>????????B?, PCr?!?? ??;?L???1??}??? ?w?????T;?9??Cs?????H?t??=???????D?????y??a?"7??? qC K=S/srs?K?????;]??v?i?R0?.~Z'?Gr??->???T?????ws~}1?????e???f??????\?4?% R??M????-?O??5|????w:s??????H=?)~?+c^??^?? ;xP? ????v T~ ????????_?-?1q??^???puS?@0Q???(?H% :?^uV???@??}??P??3?~?} [*??^&u??t?????4_WNet????RY>??5??I???????2v w?l??e?uzm?`???????6? ?q:?F?????? q*a??.J?u?X?m?????FB????S?{??@#????I???????3?l?C??3?m?l??'Ns? i?????n?'??Y?F??0lN?i??4'????y?? ?n?????XD???O??{%`>????B?? C 0Zy?q??S30???oX???3`??A??8+?dQ????+z)g??uX?x:E`z???\??.L????2?TCA?o+F?D 0>???p?}?%??? ??H>\?TH??[X??????v?????`??\/ ?H*AD5????c??""????? t'/s ?gU b??7$????%?N??l?? EbyM5??M??????s??F"g??y??a?????w R??? ?????QP'??L?3?(?????f?F??"'??2 D ??Q?_? Je`9w?????????x;?????9?}<??X?Z ?W?????W#!??vA?[ hT2??? ??/??? Lglzc ?l????r?x????P?i???,_ \??h??p??9?4??A??e??,??^h???J?$w$,?4*????e??ZW?8??}??~U?? d?Vk(GX?z?U _????_?/O??CE?:???X?CE9?n,?????????/*j ???????0n ?ZF??T }?? ?,X??????????6?.Qx??8gZ? ?L?/???da?!???????F)???8?G?@vK??F?M5?I'R??????/??.!0????? 4???k?sMFa=|d?X? ????{???h?klM??????? 7??@%?um0???m ?{?d? I?L??[ ????K?p0J??????L?c??????6??Qa????|bO??Y???$? 7z?;_??D???+?????2 !Z?6?b??U9?? ??p??\???bI& ???|\?=?k?"?s?B??IR ??{????NU??????q?K0'???P>?3r??s#?2?????v??!?5,Q4??.BG????e|?b?[??d????_?BiC ??P{@|!#\??? +q8!?q|???Z?E???Dm??????JN?????'?Y????9Wb;?&? 3Y?(??l??4???I? mI?????`6?=v???Y$?c???z??>??+??n??oxyu}|?\????P/?n\???]?S6Q[X??g????,2???bx{?z?A-:?F??F????|<?J??????lH???vV???)?Ya????D?B'???:2Q?????????6?FG?b0?XLz?????l?:?;c?D? jD?G?&???}?/?L?'o?3H?&??S1LRc????(??{???Hk??????%H??f)O2v????????7??|?x??&?g??v??l??????9PgR???a?i?????W?Ng?K??iqOCk??q?n?g?v?AH????!?!g???6??????$ }c?\?Q????e$??l ????8`(? ???d??~??,?TW????g?7????f+.??Fj???P?????????????>? ?"G?2??Y?r?P?????%??-?5I????AK.i?j?k?p-??B????}?2k?????????~????,2 ??????;????VJr??f?????????C???9Od3???c??"?A??L ?`"??L???A?a6xR???/??4???B K?? ??3?>??????????1???(.sB*???????C5gx??g??8Z?y???&,?e??????1??h???.fuw????k?nkQ??v??????ob2?$1?M??????f3???????#?P?cUL?BW?[?d??? ?w?h?GSG?7??"?}?v????g^????E????c???2;???? ???y??a?#6?+:???a(X?????4_i???^4????????_?????8X??7??? ?t??f?????n?q?49Q?????? ?^8?wn??????O)?5w$?.? ?6?r??3?i ??3???????= Y??W'??????H????Z??1;??????89~??K??BoJ? Ze?1???K&?K?st8???/ ???|^???????)??V??/|????Z???W??y?@G lE?A????Z??i4???m?? Y?[?o?????l?z?A/?o????.?oTw ?$D?!? }{??G???0?B??R?????D?P6(?!g???k\?.?7?N??????h?z!???@z?6??{;???k?EQ}?LX??C???,!ZhO3??D;U?H????5llM??`M?M???s???v3G ?X?????????????????,??"?lL? =?G?cc?-z}???M??11kM4?????? ??x?? ???(~?=BS{s{>o? l?GA?z????????6?_???k???.????%???b?'gC?r???.??? 4:? qaSL?1yMm?a4?o??p???qb?5???????;?Sr???iV N?A??3?zH??.h??3Yw???C???I?]+9???3????t?.?g?w?????F??3?_|X??I?C?NX?>?{??}k?M ?6??+1????g??=g??M"h$;*m?9Ti??Z?Mg?(m*????z??v????????????_???6m??v?95N?%H /??Zq??3?I?3????Ebh?(??J?*e?????f???f????h?S??????@???ig??????]?????/E????1? ??????Yq??#??{F???"???Z?|?9C)?:??^]???:"P+???D#5?"?FjjEj?r???G?SX^??j? ?*a?M???????8\5??:????+P????????5???sg;? ????c@p??C???? }??7l>?]9 ?????C????!??JCN ???????*g??;???iT??),?"a???!?SX^;D$N3_&K%z?J?~?kj???B?=???Dw??/ y? -a?????v/?6K?M????? ??}5?Zm0???lW??? V_ ? ? ???????z??z CAu?BA?r??$??tLt 9?????h*3x??^??????_??j???????????w????}?\??????}? (?#V&???'Bl?.#n??_;?q??{???P)?Zj?%F?k?????{??!w)?wp??g9&?v???l~?R?!??'??4?DH???????{6 ??-??/?!J??5?P??g^?p ???3?&?A???? ???\???C????3??c2??}?pL;?h?\?\?1??#b??q??_>c?????}?????c?? " f?xd?8??i?/?F??i??????o7Mm?~??????t{??:`???1??Q?4H?4??'??K?;????0#!???????c?????)*?????????hL??????T??1D???M??t??X|d?????????5??n?@?4 ???{aD??+Lc@ ? ,?u??w??b?=??P????X????? ?Q?-$?1?8'?ni?~??U? $@??S]?O?oF???Nd???7?k&??eF?r?Jh?+??x??L??????????f??~?-?VryD~#???F ?x=n}w????CJ?????????iI?'??e?:?5?~?/%??38???12???v ? ?`w????hz6 ?>/??9???????(???~?8?????_?l"qc?e???yO???j????}D?FxU?01]NN ?"z 1??? ???O ?-a ???5F;?h:_?????k.??g???l_0???}????AB ?????>h\?2?? ?s?8=?k?tnK?I??????g?a ??e??FZ??[???;????m?T??S>???????\?L??{??'^???>?g???Je?.o=)?n?~?????=?g?S???x?3?I????Q:??t?`(????)?????-oK?5p?Ik?????a?`pX?.i?Bj&m 6_ ?L????? ??F?E??N????????O~ux? ??????'???"?pz!????N???R(E?l???@?'?w.?wb?3?a??????;??k???'?????Gtrl?,c?Q^FR?;`??? ???i?0Y-?%8E???z??E????[Y?????4??h????K?W??s9?+L??6z?+k?&?k???5L?n?PJ4?M~'v?f????l?Vn???#?u?zD???7\y(=9???????? ?M??????'?Eh?u? ??c?7j??^?%????E?-?_?)?B?a?????? ??????*`?5????????D?b,????????-?????b$6*??6?fx?b??I?? 5H2??????0_?;S\??f??F?5?}?DU"d?kXXi?a????-O?q???]2??%?n\2{x??:s?????%??\???%??w??3?,?q???]???%?n\?zx??:s???l?%??\b?ML??w T?3?t?????????[?\??6?w?C/?!| ???K?S??F?#V\t?}?>?w ????????L???-?i?/??????_???????.???l?m?}y_?o????HVWj?V????tP????? i??a? ?? }v??F?????????&S\?? ??>?*??n???_7????i??/?G????.??H!-? )L???????bP??t???????[??Gt)?w?7?%?R?c????o??(? ??????. ??????y???????y??<}?r?GM?W?n"??g??F?u?D???????x??????|!??D?3q?????'???u???????vE>???~??????wAn???!??????????=_??\????Ar????7?:?????? [??GXF??u??mF???xtN?f?????z??Z DC_=?$D ?2_???i?h?? N?~ ? L?G??w-???????I|?SG??I??s?.+??05 J?sFV08o????XT}=??+?????$??(?m?)?0stt???-?*I??6MF 3????oSt?m?%B`????d???s????8?z?????z??R??DXu??? ,? ????MZ?W??A?X?????@?????` ?I?t'.?g??I3m? `???2?????]#s vF????x?I?? ?A4}???Z????????&x??????n, ???$3>??R2-? OpenOffice.org/2.0$Win32 OpenOffice.org_project/680m1$Build-8990AOLKey Card Edge Applet Interfacerelyea2004-03-05T17:54:00Robert Relyea2005-08-26T11:32:14Robert Relyea2005-03-30T17:38:41en-US23P1DT13H6M17SPK I?U\?Q???tS?+TH5Z^??*?)?4$?j?7????????g??3???3??????}??(?* ;N?O$???Fr ?3I0c?????O???8 ? ???]M????? 8o?/?t5w???3?A?2?d???{????u????6 lX^?A>???5????????:J??T??{_??O/?H????W?9"D]??p ??Fx*???U???????? >?t???\?cE$???1??s?j?k???:?767??N4?)???????5??tj?X :T?tF?T?c ??? ?e?u?\?S?Rb?`)??[????/-u7?_?,??Bv+a ?????9S3vJ?X\???/'????2????? ??.??+L)+?% ?J??w???c?fI;}???oO50?[v???A[U????R3????U??O??I?n?!T!???l??Xu????b#??{??2*?????kks?*\?fcy??"???'_???/???o_8?W??4s ?gs????????r?GC?$?{?m??Y?t?=?7???ia???Sl?:??a?V????C?q7K~#??1!\2? ?4F/2?a ?A ???$?[??W????m???p??J?a-3?? R???T b?????P?Q ?G#?%J:&*?a???93?e??5??.R??j??ykxp??l?+???r? %?7/?|~??~????J|#?G?EkjM?y?xX? mu?/JD?/?Z"?c:??xl?<$??q\??"t~E ?Y(3B???F?D?7?HG2CJ???9z??????< ??xy?? , /o??L at Qv!?5??????Hw?.wy?a$?/?LB???w??,&?}?S??s?2??"L?o_?? d??????YB??? ???^?u?p(?rhA? ??:p ??H?X?????93???yo?5|?z ???????????W?y???????????/?m????????z??:??c???:?????c??????s??;g_;g/??o?g?:???Wn?C??????????r??t?????n?^????????????????????? V???_???????????s?k?????s?/?+???c??????q???????{??w???????? EY??LH???0?? H?A?Q??F??2??U?N,y?Pk??Q???l?`??r|?,??@RgV??@9@9???? ?????S?.f<~s??????)5V8???[?Z?e???[ ???PJo????$???jY?r?AHE?P,?? ??F??????????t|#???Hg at I?%??0?t$?u??pM?0?g\?i)?s1M?7_N???$l??????2?0???{c?,ow??d???????=??=?????{M???'???H'?]??????_???_?xBg?????????\??p??4y?X??????$????4P?r ?(KQ?? ? ????????%K???vDJ+ }i????~???b/???????< L?????n?q??'?H??reJ??[?B????a?^d???$?B{??l??? B????uQ??kJ????|????|?E ??X?9??[f???4????7^??????^?S?????^t1fr??$ ??*???L??uJe][?$??rv?b? ???t?Mj???r??2?X ??a?Aa???6????|????l?a+[0QR??-??x 4 ????????Z?G?V?????l?Hc=?~?j(???[?F?????)?y??PK??; ? From rmeggins at fedoraproject.org Mon Apr 6 17:23:38 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Mon, 6 Apr 2009 17:23:38 +0000 (UTC) Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.60, 1.61 aclocal.m4, 1.82, 1.83 configure, 1.103, 1.104 missing, 1.61, 1.62 install-sh, 1.61, 1.62 depcomp, 1.61, 1.62 compile, 1.54, 1.55 config.sub, 1.60, 1.61 config.guess, 1.60, 1.61 Makefile.in, 1.106, 1.107 Message-ID: <20090406172338.A93737013C@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19300/ldapserver Modified Files: configure.ac aclocal.m4 configure missing install-sh depcomp compile config.sub config.guess Makefile.in Log Message: add back support for linux ppc Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- configure.ac 30 Mar 2009 22:32:35 -0000 1.60 +++ configure.ac 6 Apr 2009 17:23:29 -0000 1.61 @@ -296,35 +296,30 @@ # those with our 64 bit compiled product. perlexec='/usr/bin/env perl' case $host in - i*86-*-linux*) + *-*-linux*) AC_DEFINE([XP_UNIX], [1], [UNIX]) AC_DEFINE([Linux], [1], [Linux]) AC_DEFINE([LINUX], [1], [Linux]) AC_DEFINE([LINUX2_0], [1], [Linux 2.0]) AC_DEFINE([LINUX2_2], [1], [Linux 2.2]) AC_DEFINE([LINUX2_4], [1], [Linux 2.4]) - AC_DEFINE([CPU_x86], [], [cpu type x86]) AC_DEFINE([_GNU_SOURCE], [1], [GNU Source]) - AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) - AC_CHECK_DECLS([__sync_add_and_fetch]) - platform="linux" - # relative to sysconfdir - initdir=/rc.d/init.d - ;; - x86_64-*-linux*) - AC_DEFINE([XP_UNIX], [1], [UNIX]) - AC_DEFINE([Linux], [1], [Linux]) - AC_DEFINE([LINUX], [1], [Linux]) - AC_DEFINE([LINUX2_0], [1], [Linux 2.0]) - AC_DEFINE([LINUX2_2], [1], [Linux 2.2]) - AC_DEFINE([LINUX2_4], [1], [Linux 2.4]) - AC_DEFINE([CPU_x86_64], [], [cpu type x86_64]) - AC_DEFINE([_GNU_SOURCE], [1], [GNU Source]) - AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) - AC_CHECK_DECLS([__sync_add_and_fetch]) platform="linux" # relative to sysconfdir initdir=/rc.d/init.d + # do arch specific linux stuff here + case $host in + i*86-*-linux*) + AC_DEFINE([CPU_x86], [], [cpu type x86]) + AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) + AC_CHECK_DECLS([__sync_add_and_fetch]) + ;; + x86_64-*-linux*) + AC_DEFINE([CPU_x86_64], [], [cpu type x86_64]) + AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter]) + AC_CHECK_DECLS([__sync_add_and_fetch]) + ;; + esac ;; ia64-hp-hpux*) AC_DEFINE([XP_UNIX], [1], [UNIX]) Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- configure 30 Mar 2009 22:32:35 -0000 1.103 +++ configure 6 Apr 2009 17:23:30 -0000 1.104 @@ -23381,7 +23381,7 @@ # those with our 64 bit compiled product. perlexec='/usr/bin/env perl' case $host in - i*86-*-linux*) + *-*-linux*) cat >>confdefs.h <<\_ACEOF #define XP_UNIX 1 @@ -23414,12 +23414,18 @@ cat >>confdefs.h <<\_ACEOF -#define CPU_x86 +#define _GNU_SOURCE 1 _ACEOF + platform="linux" + # relative to sysconfdir + initdir=/rc.d/init.d + # do arch specific linux stuff here + case $host in + i*86-*-linux*) cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 +#define CPU_x86 _ACEOF @@ -23427,7 +23433,7 @@ #define ATOMIC_64BIT_OPERATIONS 1 _ACEOF - echo "$as_me:$LINENO: checking whether __sync_add_and_fetch is declared" >&5 + echo "$as_me:$LINENO: checking whether __sync_add_and_fetch is declared" >&5 echo $ECHO_N "checking whether __sync_add_and_fetch is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl___sync_add_and_fetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23499,41 +23505,8 @@ fi - platform="linux" - # relative to sysconfdir - initdir=/rc.d/init.d - ;; - x86_64-*-linux*) - -cat >>confdefs.h <<\_ACEOF -#define XP_UNIX 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define Linux 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define LINUX 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define LINUX2_0 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define LINUX2_2 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define LINUX2_4 1 -_ACEOF - + ;; + x86_64-*-linux*) cat >>confdefs.h <<\_ACEOF #define CPU_x86_64 @@ -23541,15 +23514,10 @@ cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF #define ATOMIC_64BIT_OPERATIONS 1 _ACEOF - echo "$as_me:$LINENO: checking whether __sync_add_and_fetch is declared" >&5 + echo "$as_me:$LINENO: checking whether __sync_add_and_fetch is declared" >&5 echo $ECHO_N "checking whether __sync_add_and_fetch is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl___sync_add_and_fetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23621,9 +23589,8 @@ fi - platform="linux" - # relative to sysconfdir - initdir=/rc.d/init.d + ;; + esac ;; ia64-hp-hpux*) From rmeggins at fedoraproject.org Mon Apr 6 18:11:21 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Mon, 6 Apr 2009 18:11:21 +0000 (UTC) Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd slapi_counter.c, 1.7, 1.8 Message-ID: <20090406181121.125127013D@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31169 Modified Files: slapi_counter.c Log Message: re-enable ppc support NOTE: We do not have support for atomic 64-bit counters on ppc - ppc platorms use the mutex approach instead Index: slapi_counter.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi_counter.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- slapi_counter.c 21 Nov 2008 17:06:05 -0000 1.7 +++ slapi_counter.c 6 Apr 2009 18:11:18 -0000 1.8 @@ -53,6 +53,7 @@ #endif #endif +#ifdef ATOMIC_64BIT_OPERATIONS #if defined LINUX && (defined CPU_x86 || !HAVE_DECL___SYNC_ADD_AND_FETCH) /* On systems that don't have the 64-bit GCC atomic builtins, we need to * implement our own atomic functions using inline assembly code. */ @@ -69,6 +70,8 @@ #define __sync_add_and_fetch __sync_add_and_fetch_8 #define __sync_sub_and_fetch __sync_sub_and_fetch_8 #endif +#endif /* ATOMIC_64BIT_OPERATIONS */ + /* * Counter Structure @@ -428,6 +431,7 @@ return value; } +#ifdef ATOMIC_64BIT_OPERATIONS #if defined LINUX && (defined CPU_x86 || !HAVE_DECL___SYNC_ADD_AND_FETCH) /* On systems that don't have the 64-bit GCC atomic builtins, we need to * implement our own atomic add and subtract functions using inline @@ -520,3 +524,4 @@ return retval; } #endif /* LINUX && (defined CPU_x86 || !HAVE_DECL___SYNC_ADD_AND_FETCH) */ +#endif /* ATOMIC_64BIT_OPERATIONS */ From rmeggins at fedoraproject.org Wed Apr 8 22:47:46 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Wed, 8 Apr 2009 22:47:46 +0000 (UTC) Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src AdminServer.pm.in, 1.16, 1.17 setup-ds-admin.pl.in, 1.14, 1.15 Message-ID: <20090408224746.915AA70137@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10013/adminserver/admserv/newinst/src Modified Files: AdminServer.pm.in setup-ds-admin.pl.in Log Message: Resolves: bug 494980 Bug Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress Reviewed by: nkinder (Thanks!) Fix Description: We were only setting the default ServerIpAddress in the regular interactive mode, not in -u or silent mode. In addition, I found several other parameters that had the same problem. I borrowed code from the interactive mode code to set the default values. Platforms tested: RHEL5 Flag Day: no Doc impact: no Index: AdminServer.pm.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- AdminServer.pm.in 27 Feb 2009 14:33:27 -0000 1.16 +++ AdminServer.pm.in 8 Apr 2009 22:47:43 -0000 1.17 @@ -21,10 +21,10 @@ @ISA = qw(Exporter); @EXPORT = qw(createAdminServer reconfigAdminServer createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles - startAdminServer removeAdminServer); + startAdminServer removeAdminServer setDefaults); @EXPORT_OK = qw(createAdminServer reconfigAdminServer createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles - startAdminServer removeAdminServer); + startAdminServer removeAdminServer setDefaults); use File::Path; # tempfiles @@ -41,16 +41,51 @@ use Setup; use AdminUtil; +sub setDefaults { + my $setup = shift; + + if (!defined($setup->{inf}->{admin}->{ServerIpAddress})) { + $setup->{inf}->{admin}->{ServerIpAddress} = '@admservip@'; + } + if (!defined($setup->{inf}->{admin}->{Port})) { + $setup->{inf}->{admin}->{Port} = @admservport@; + } + if (!defined($setup->{inf}->{admin}->{SysUser})) { + my $user = $setup->{inf}->{General}->{SuiteSpotUserID}; + if (!defined($user)) { + if ($> == 0) { # if root, use the default user + $user = "@httpduser@"; + } else { # if not root, use the user's uid + $user = getLogin; + } + } + $setup->{inf}->{admin}->{SysUser} = $user; + } + if (!defined($setup->{inf}->{admin}->{ServerAdminID})) { + my $id = $setup->{inf}->{General}->{ConfigDirectoryAdminID}; + if (isValidDN($id)) { + $id =~ s/^(.*)=.*/$1/; + } + $setup->{inf}->{admin}->{ServerAdminID} = $id; + } + if (!defined($setup->{inf}->{admin}->{ServerAdminPwd})) { + my $pwd = $setup->{inf}->{General}->{ConfigDirectoryAdminPwd}; + $setup->{inf}->{admin}->{ServerAdminPwd} = $pwd; + } + + return 1; +} + sub checkRequiredParameters { my $setup = shift; - for my $asparam (qw(Port SysUser ServerAdminID ServerAdminPwd)) { + for my $asparam (qw(ServerIpAddress Port SysUser ServerAdminID ServerAdminPwd)) { if (!defined($setup->{inf}->{admin}->{$asparam})) { $setup->msg($FATAL, "missing_adminserver_param", $asparam); return 0; } } - for my $general (qw(SuiteSpotUserID SuiteSpotGroup ConfigDirectoryLdapURL)) { + for my $general (qw(AdminDomain SuiteSpotUserID SuiteSpotGroup ConfigDirectoryLdapURL)) { if (!defined($setup->{inf}->{General}->{$general})) { $setup->msg($FATAL, "missing_general_param", $general); return 0; @@ -434,6 +469,10 @@ $setup->msg('begin_create_adminserver'); } + if (!setDefaults($setup)) { + return 0; + } + if (!checkRequiredParameters($setup)) { return 0; } Index: setup-ds-admin.pl.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- setup-ds-admin.pl.in 27 Feb 2009 14:33:27 -0000 1.14 +++ setup-ds-admin.pl.in 8 Apr 2009 22:47:43 -0000 1.15 @@ -30,6 +30,7 @@ use AdminUtil; use AdminServer; use Util; +use Net::Domain qw(hostfqdn); my $res = new Resource("@propertydir@/setup-ds.res", "@propertydir@/setup-ds-admin.res"); @@ -93,6 +94,14 @@ $setup->{inf}->{slapd}->{SlapdConfigForMC} = 0; } $setup->{reconfigas} = 1; # allow AS reconfig +} else { + # default to creating the config DS + unless (defined($setup->{inf}->{slapd}->{UseExistingMC})) { + $setup->{inf}->{slapd}->{UseExistingMC} = 0; + } + unless (defined($setup->{inf}->{slapd}->{SlapdConfigForMC})) { + $setup->{inf}->{slapd}->{SlapdConfigForMC} = "yes"; + } } # do not allow reconfig (setup -r) if no setup has been done @@ -145,6 +154,7 @@ } } +# set default values my $createconfigds; if ((defined($setup->{inf}->{slapd}->{SlapdConfigForMC}) and ("yes" =~ /^$setup->{inf}->{slapd}->{SlapdConfigForMC}/i)) or @@ -159,6 +169,24 @@ $createconfigds = 1; } +if (!defined($setup->{inf}->{General}->{ConfigDirectoryAdminID})) { + $setup->{inf}->{General}->{ConfigDirectoryAdminID} = "admin"; +} + +if (!defined($setup->{inf}->{General}->{AdminDomain})) { + my $admindomain = $setup->{inf}->{General}->{FullMachineName} || + hostfqdn; + $admindomain =~ s/^[^\.]*\.//; # just the domain part + $setup->{inf}->{General}->{AdminDomain} = $admindomain; +} + +if (!defined($setup->{inf}->{General}->{SuiteSpotGroup})) { + $setup->{inf}->{General}->{SuiteSpotGroup} = "@httpdgroup@"; +} + +# for admin server too, since ServerAdminID is used by AdminUtil code +AdminServer::setDefaults($setup); + $setup->{inf}->write(); my @errs; From rmeggins at fedoraproject.org Thu Apr 9 01:05:42 2009 From: rmeggins at fedoraproject.org (Richard Allen Megginson) Date: Thu, 9 Apr 2009 01:05:42 +0000 (UTC) Subject: [Fedora-directory-commits] adminserver/pkg fedora-ds-admin.spec, 1.6, 1.7 Message-ID: <20090409010542.A06C770137@cvs1.fedora.phx.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/pkg In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10751/adminserver/pkg Modified Files: fedora-ds-admin.spec Log Message: bump version for bug fix Index: fedora-ds-admin.spec =================================================================== RCS file: /cvs/dirsec/adminserver/pkg/fedora-ds-admin.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedora-ds-admin.spec 3 Apr 2009 16:10:23 -0000 1.6 +++ fedora-ds-admin.spec 9 Apr 2009 01:05:39 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Fedora Administration Server (admin) Name: fedora-ds-admin Version: 1.1.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://directory.fedoraproject.org/ Group: System Environment/Daemons @@ -147,6 +147,11 @@ %{_mandir}/man8/* %changelog +* Wed Apr 8 2009 Rich Megginson - 1.1.7-3 +- Resolves: bug 494980 +- Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress +- CVS tag FedoraDirSrvAdmin_1_1_7_RC3 FedoraDirSrvAdmin_1_1_7_RC3_20090408 + * Fri Apr 3 2009 Rich Megginson - 1.1.7-2 - Resolves: bug 493989 - Description: Admin Server: valgrind invalid read in security.c when installing CRL From jmagne at fedoraproject.org Wed Apr 15 01:35:10 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 15 Apr 2009 01:35:10 +0000 (UTC) Subject: [Fedora-directory-commits] esc/win32 setup.iss,1.6,1.7 Message-ID: <20090415013510.C7C4770137@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27812 Modified Files: setup.iss Log Message: Fix for #495765, add smart card login reg entries for the 330J. Index: setup.iss =================================================================== RCS file: /cvs/dirsec/esc/win32/setup.iss,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- setup.iss 30 Mar 2009 22:05:41 -0000 1.6 +++ setup.iss 15 Apr 2009 01:35:07 -0000 1.7 @@ -4,14 +4,14 @@ [Setup] AppName=Smart Card Manager AppMutex=ESCMutex -AppVerName=Smart Card Manager 1.1.0-3 +AppVerName=Smart Card Manager 1.1.0-4 AppPublisher=Red Hat, Inc. CreateAppDir=true Compression=lzma SolidCompression=true MinVersion=0,5.0.2195 ShowLanguageDialog=yes -OutputBaseFilename=SmartCardManagerSetup-1.1.0-3.win32.i386 +OutputBaseFilename=SmartCardManagerSetup-1.1.0-4.win32.i386 DefaultDirName={pf}\Red Hat\ESC DisableProgramGroupPage=false DefaultGroupName=Red Hat @@ -24,7 +24,7 @@ InfoBeforeFile=info-before.txt InfoAfterFile=info-after.txt PrivilegesRequired=admin -VersionInfoVersion=1.1.0.3 +VersionInfoVersion=1.1.0.4 [Files] @@ -450,12 +450,18 @@ Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00 ; Now register the Gemalto 64K V2 -Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask: ValueData: ff ff ff ff ff ff ff ff ff ff; Flags: uninsdeletekey +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask; ValueData: ff ff 00 ff 00 ff ff ff 00 00; Flags: uninsdeletekey -Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP -Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: binary; ValueName: ATR; ValueData: 3b 95 95 40 ff ae 01 03 00 00 +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATR; ValueData: 3b 95 00 40 00 ae 01 03 00 00 +; Now register the Safenet 330J +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey + +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypt Provider; ValueData: CoolKey PKCS #11 CSP + +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATR; ValueData: 3b ec 00 ff 81 31 fe 45 a0 00 00 00 56 33 33 30 4a 33 06 00 00 Root: HKLM; Subkey: Software\ ; Turn off the "pick a cert" dialog box From jmagne at fedoraproject.org Wed Apr 15 21:02:14 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 15 Apr 2009 21:02:14 +0000 (UTC) Subject: [Fedora-directory-commits] esc/win32 setup.iss,1.7,1.8 Message-ID: <20090415210214.B95AE70127@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10121 Modified Files: setup.iss Log Message: Minor typo. Index: setup.iss =================================================================== RCS file: /cvs/dirsec/esc/win32/setup.iss,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- setup.iss 15 Apr 2009 01:35:07 -0000 1.7 +++ setup.iss 15 Apr 2009 21:02:11 -0000 1.8 @@ -459,7 +459,7 @@ ; Now register the Safenet 330J Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey -Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypt Provider; ValueData: CoolKey PKCS #11 CSP +Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATR; ValueData: 3b ec 00 ff 81 31 fe 45 a0 00 00 00 56 33 33 30 4a 33 06 00 00 From jmagne at fedoraproject.org Wed Apr 15 21:47:34 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 15 Apr 2009 21:47:34 +0000 (UTC) Subject: [Fedora-directory-commits] esc/win32 setup.iss,1.8,1.9 Message-ID: <20090415214735.1429770127@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21283 Modified Files: setup.iss Log Message: More minor edits. Index: setup.iss =================================================================== RCS file: /cvs/dirsec/esc/win32/setup.iss,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- setup.iss 15 Apr 2009 21:02:11 -0000 1.8 +++ setup.iss 15 Apr 2009 21:47:32 -0000 1.9 @@ -5,19 +5,20 @@ AppName=Smart Card Manager AppMutex=ESCMutex AppVerName=Smart Card Manager 1.1.0-4 -AppPublisher=Red Hat, Inc. +AppPublisher=Fedora CreateAppDir=true Compression=lzma SolidCompression=true MinVersion=0,5.0.2195 ShowLanguageDialog=yes OutputBaseFilename=SmartCardManagerSetup-1.1.0-4.win32.i386 -DefaultDirName={pf}\Red Hat\ESC +DefaultDirName={pf}\Fedora\ESC DisableProgramGroupPage=false -DefaultGroupName=Red Hat +DefaultGroupName=Fedora SetupIconFile=BUILD\ESC\components\esc.ico UninstallDisplayIcon={app}\components\esc.ico -WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp +;WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp +WizardImageFile=esc-image-large.bmp WizardSmallImageFile=BUILD\ESC\components\esc.bmp AllowNoIcons=yes LicenseFile=esc-license.txt From nhosoi at fedoraproject.org Thu Apr 16 17:03:15 2009 From: nhosoi at fedoraproject.org (Noriko Hosoi) Date: Thu, 16 Apr 2009 17:03:15 +0000 (UTC) Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.27, 1.28 Message-ID: <20090416170315.B5FE670137@cvs1.fedora.phx.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2949 Modified Files: log.c Log Message: Resolves: #475338 Summary: LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer (comment #20) Description: 1) replaced PR_GetOpenFileInfo with PR_GetOpenFileInfo64 in log_getfilesize. PR_GetOpenFileInfo does not return the correct file size if the size is larger than 2GB. 2) when a rotation info file is missing and recreated, the file size stored in the file was not correct. 3) rotated file name is created with the time stamp when rotated. The reverse conversion function had a problem and the file name in the rotation info and the real one could mismatch. Index: log.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- log.c 13 Mar 2009 20:35:37 -0000 1.27 +++ log.c 16 Apr 2009 17:03:13 -0000 1.28 @@ -124,6 +124,7 @@ static int log__extract_logheader (FILE *fp, long *f_ctime, PRInt64 *f_size); static int log__check_prevlogs (FILE *fp, char *filename); static PRInt64 log__getfilesize(LOGFD fp); +static PRInt64 log__getfilesize_with_filename(char *filename); static int log__enough_freespace(char *path); static int vslapd_log_error(LOGFD fp, char *subsystem, char *fmt, va_list ap, int locked ); @@ -2515,6 +2516,8 @@ int log_type_id; int rval = LOG_ERROR; char *p; + char *rotated_log = NULL; + int rotated_log_len = 0; /* rotation info file is broken; can't trust the contents */ time (&now); @@ -2557,6 +2560,10 @@ loginfo.log_audit_logchain = NULL; break; } + /* length of (pathname + .YYYYMMDD-hhmmss) + * pathname includes ".rotationinfo", but that's fine. */ + rotated_log_len = strlen(pathname) + 17; + rotated_log = (char *)slapi_ch_malloc(rotated_log_len); /* read the directory entries into a linked list */ for (dirent = PR_ReadDir(dirptr, dirflags); dirent ; dirent = PR_ReadDir(dirptr, dirflags)) { @@ -2589,21 +2596,24 @@ logp = (struct logfileinfo *) slapi_ch_malloc (sizeof (struct logfileinfo)); logp->l_ctime = log_reverse_convert_time(p); + + PR_snprintf(rotated_log, rotated_log_len, "%s/%s", + dirptr, dirent->name); switch (log_type_id) { case ERRORSLOG: - logp->l_size = loginfo.log_error_maxlogsize; /* dummy */ + logp->l_size = log__getfilesize_with_filename(rotated_log); logp->l_next = loginfo.log_error_logchain; loginfo.log_error_logchain = logp; loginfo.log_numof_error_logs++; break; case ACCESSLOG: - logp->l_size = loginfo.log_access_maxlogsize; + logp->l_size = log__getfilesize_with_filename(rotated_log); logp->l_next = loginfo.log_access_logchain; loginfo.log_access_logchain = logp; loginfo.log_numof_access_logs++; break; case AUDITLOG: - logp->l_size =loginfo.log_audit_maxlogsize; + logp->l_size = log__getfilesize_with_filename(rotated_log); logp->l_next = loginfo.log_audit_logchain; loginfo.log_audit_logchain = logp; loginfo.log_numof_audit_logs++; @@ -2616,6 +2626,7 @@ if (NULL != dirptr) PR_CloseDir(dirptr); slapi_ch_free_string(&logsdir); + slapi_ch_free_string(&rotated_log); return rval; } #undef ERRORSLOG @@ -2890,12 +2901,23 @@ static PRInt64 log__getfilesize(LOGFD fp) { - PRFileInfo info; + PRFileInfo64 info; - if (PR_GetOpenFileInfo (fp, &info) == PR_FAILURE) { + if (PR_GetOpenFileInfo64 (fp, &info) == PR_FAILURE) { return -1; } - return (PRInt64)info.size; /* type of size is off_t */ + return (PRInt64)info.size; /* type of size is PROffset64 */ +} + +static PRInt64 +log__getfilesize_with_filename(char *filename) +{ + PRFileInfo64 info; + + if (PR_GetFileInfo64 ((const char *)filename, &info) == PR_FAILURE) { + return -1; + } + return (PRInt64)info.size; /* type of size is PROffset64 */ } #endif @@ -4047,16 +4069,20 @@ log_reverse_convert_time(char *tbuf) { struct tm tm = {0}; + time_t converted = 0; if (strchr(tbuf, '-')) { /* short format */ strptime(tbuf, "%Y%m%d-%H%M%S", &tm); + /* tm returned from strptime is one hour (3600 sec) advanced if + * short format is used. Adjusting it to the original string. + */ + converted = mktime(&tm) - 3600; } else if (strchr(tbuf, '/') && strchr(tbuf, ':')) { /* long format */ strptime(tbuf, "%d/%b/%Y:%H:%M:%S", &tm); - } else { - return 0; + converted = mktime(&tm); } - return mktime(&tm); + return converted; } int From nhosoi at fedoraproject.org Thu Apr 16 20:11:15 2009 From: nhosoi at fedoraproject.org (Noriko Hosoi) Date: Thu, 16 Apr 2009 20:11:15 +0000 (UTC) Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.28, 1.29 Message-ID: <20090416201115.367A470137@cvs1.fedora.phx.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21668 Modified Files: log.c Log Message: Resolves: #475338 Summary: LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer (comment #20) Description: In log_reverse_convert_time, by initializing "struct tm" with NULLs: struct tm tm = {0}; tm_isdst is also set to 0, which means no daylight saving. mktime thinks when converting struct tm to time_t, use the knowledge "the time that the time_t represents is not in the daylight saving period". Instead, we should have set "tm.tm_isdst = -1;". That means, we don't have the knowledge, calculate it in mktime. I also fixed a silly bug in generating a rotated log file name which I introduced in my previous checkin. Index: log.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- log.c 16 Apr 2009 17:03:13 -0000 1.28 +++ log.c 16 Apr 2009 20:11:12 -0000 1.29 @@ -2598,7 +2598,7 @@ logp->l_ctime = log_reverse_convert_time(p); PR_snprintf(rotated_log, rotated_log_len, "%s/%s", - dirptr, dirent->name); + logsdir, dirent->name); switch (log_type_id) { case ERRORSLOG: logp->l_size = log__getfilesize_with_filename(rotated_log); @@ -4069,20 +4069,16 @@ log_reverse_convert_time(char *tbuf) { struct tm tm = {0}; - time_t converted = 0; if (strchr(tbuf, '-')) { /* short format */ strptime(tbuf, "%Y%m%d-%H%M%S", &tm); - /* tm returned from strptime is one hour (3600 sec) advanced if - * short format is used. Adjusting it to the original string. - */ - converted = mktime(&tm) - 3600; } else if (strchr(tbuf, '/') && strchr(tbuf, ':')) { /* long format */ strptime(tbuf, "%d/%b/%Y:%H:%M:%S", &tm); - converted = mktime(&tm); + } else { + return 0; } - - return converted; + tm.tm_isdst = -1; + return mktime(&tm); } int From jmagne at fedoraproject.org Fri Apr 17 00:11:14 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Fri, 17 Apr 2009 00:11:14 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xpcom Makefile.sdk,1.2,1.3 Message-ID: <20090417001114.48FD47012B@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10822/app/xpcom Modified Files: Makefile.sdk Log Message: Minor Linux build fixes. Index: Makefile.sdk =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.sdk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.sdk 4 Feb 2009 02:38:07 -0000 1.2 +++ Makefile.sdk 17 Apr 2009 00:11:11 -0000 1.3 @@ -178,8 +178,8 @@ install:: ifdef DESTDIR - cp -rf $(DEPLOY_OBJDIR)/esc/* $(DESTDIR) - cp -f $(CORE_DIST)/bin/escd $(DESTDIR) + cp -rf $(DEPLOY_OBJDIR)/esc/* $(DESTDIR) + cp -f $(CORE_DIST)/bin/escd $(DESTDIR) endif @@ -204,8 +204,8 @@ $(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES) $(CXX) $(CPPFLAGS) -shared -o $(TARGET) $(OBJECT) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(GECKO_LDFLAGS) $(COOL_LDFLAGS) - chmod +x $(TARGET) - strip $(TARGET) + chmod +x $(TARGET) + strip $(TARGET) endif ifeq ($(OS_ARCH),WINNT) From jmagne at fedoraproject.org Fri Apr 17 00:11:14 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Fri, 17 Apr 2009 00:11:14 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xpcom/tray rhLinuxTray.cpp, 1.7, 1.8 Message-ID: <20090417001114.26DE970141@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom/tray In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10822/app/xpcom/tray Modified Files: rhLinuxTray.cpp Log Message: Minor Linux build fixes. Index: rhLinuxTray.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhLinuxTray.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rhLinuxTray.cpp 4 Feb 2009 01:43:46 -0000 1.7 +++ rhLinuxTray.cpp 17 Apr 2009 00:11:11 -0000 1.8 @@ -23,6 +23,7 @@ #include "notifytray.h" #include "intl/nsIStringBundle.h" #include +#include NS_IMPL_ISUPPORTS1(rhTray, rhITray) From jmagne at fedoraproject.org Fri Apr 17 00:11:14 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Fri, 17 Apr 2009 00:11:14 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src Makefile,1.5,1.6 Message-ID: <20090417001114.50A3A7013F@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10822 Modified Files: Makefile Log Message: Minor Linux build fixes. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 4 Feb 2009 01:43:46 -0000 1.5 +++ Makefile 17 Apr 2009 00:11:11 -0000 1.6 @@ -27,11 +27,11 @@ endif ifeq ($(OS_ARCH), Darwin) -DIRS += xulrunner app/xpcom/tray app/xpcom +DIRS += app/xpcom/tray app/xpcom endif ifeq ($(OS_ARCH), Linux) -DIRS += xulrunner lib/notifytray app/daemon app/xpcom/tray app/xpcom +DIRS += lib/notifytray app/daemon app/xpcom/tray app/xpcom endif From jmagne at fedoraproject.org Sat Apr 18 23:25:17 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Sat, 18 Apr 2009 23:25:17 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xpcom/tray Makefile.sdk, 1.1, 1.2 Message-ID: <20090418232517.912D170141@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom/tray In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/app/xpcom/tray Modified Files: Makefile.sdk Log Message: Fix for #496410. Index: Makefile.sdk =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.sdk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.sdk 4 Feb 2009 01:43:46 -0000 1.1 +++ Makefile.sdk 18 Apr 2009 23:25:14 -0000 1.2 @@ -23,20 +23,20 @@ include $(CORE_DEPTH)/coreconf/rules.mk ifeq ($(OS_ARCH),Linux) -CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) +CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC endif # Change this to point at your Gecko SDK directory. ifndef GECKO_SDK_PATH -GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9pre/sdk +GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9/sdk endif GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/include ifndef GECKO_INCLUDE_PATH -GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9pre +GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9 endif ifndef GECKO_BIN_PATH -GECKO_BIN_PATH=/usr/lib/xulrunner-1.9pre +GECKO_BIN_PATH=/usr/lib/xulrunner-1.9 endif ifeq ($(OS_ARCH),Darwin) @@ -148,6 +148,10 @@ endif +ifeq ($(OS_ARCH),Linux) +GECKO_LD_LIBS= -L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue_s.a +endif + # GCC only define which allows us to not have to #include mozilla-config # in every .cpp file. If your not using GCC remove this line and add From jmagne at fedoraproject.org Sat Apr 18 23:25:17 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Sat, 18 Apr 2009 23:25:17 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/lib/coolkey SmartCardMonitoringThread.cpp, 1.3, 1.4 Message-ID: <20090418232517.A92E4700F7@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/lib/coolkey Modified Files: SmartCardMonitoringThread.cpp Log Message: Fix for #496410. Index: SmartCardMonitoringThread.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/SmartCardMonitoringThread.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SmartCardMonitoringThread.cpp 24 Feb 2007 02:22:04 -0000 1.3 +++ SmartCardMonitoringThread.cpp 18 Apr 2009 23:25:15 -0000 1.4 @@ -104,12 +104,16 @@ char tBuff[56]; PK11SlotInfo *slot; + #ifdef LINUX + sleep(3); + #endif + PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, ("%s SmartCardMonitoringThread::Execute.\n",GetTStamp(tBuff,56))); // // populate token names for already inserted tokens. // - PK11SlotList *sl = + /* PK11SlotList *sl = PK11_FindSlotsByNames(mModule->dllName, NULL, NULL, PR_TRUE); PK11SlotListElement *sle; @@ -123,6 +127,8 @@ PK11_FreeSlotList(sl); } + */ + // loop starts.. do { From jmagne at fedoraproject.org Sat Apr 18 23:25:17 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Sat, 18 Apr 2009 23:25:17 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xul/esc application.ini, 1.7, 1.8 Message-ID: <20090418232517.A83B97013F@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/app/xul/esc Modified Files: application.ini Log Message: Fix for #496410. Index: application.ini =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- application.ini 4 Feb 2009 01:43:46 -0000 1.7 +++ application.ini 18 Apr 2009 23:25:15 -0000 1.8 @@ -25,7 +25,7 @@ Name=ESC ; ; This field specifies your application's version. This field is optional. -Version=1.1.0-1 +Version=1.1.0-3 ; ; This field specifies your application's build ID (timestamp). This field is ; required. From jmagne at fedoraproject.org Sat Apr 18 23:25:17 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Sat, 18 Apr 2009 23:25:17 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc GenericAuth.xul, 1.5, 1.6 Message-ID: <20090418232517.A143670137@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/app/xul/esc/chrome/content/esc Modified Files: GenericAuth.xul Log Message: Fix for #496410. Index: GenericAuth.xul =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- GenericAuth.xul 26 Feb 2009 22:34:43 -0000 1.5 +++ GenericAuth.xul 18 Apr 2009 23:25:15 -0000 1.6 @@ -24,7 +24,7 @@ id="esc-window" title="&genericAuthTitle;" width="400" - height="225" + height="240" onload="UiLoad();" onunload="UiUnload();" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> From nkinder at fedoraproject.org Tue Apr 21 17:22:28 2009 From: nkinder at fedoraproject.org (Nathan Kinder) Date: Tue, 21 Apr 2009 17:22:28 +0000 (UTC) Subject: [Fedora-directory-commits] ldapserver/ldap/servers/snmp main.c, 1.16, 1.17 Message-ID: <20090421172228.5CF2370137@cvs1.fedora.phx.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/snmp In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7579/ldap/servers/snmp Modified Files: main.c Log Message: Resolves: 496836 Summary: Corrected semaphore name used in SNMP subagent. Index: main.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- main.c 24 Oct 2008 22:36:59 -0000 1.16 +++ main.c 21 Apr 2009 17:22:24 -0000 1.17 @@ -357,10 +357,10 @@ } /* set the semaphore name */ - /* ".stats" + \0 = 7 */ - serv_p->stats_sem_name = malloc(strlen(p) + 7); + /* "/" + ".stats" + \0 = 8 */ + serv_p->stats_sem_name = malloc(strlen(p) + 8); if (serv_p->stats_sem_name != NULL) { - snprintf(serv_p->stats_sem_name, strlen(p) + 7, "%s.stats", p); + snprintf(serv_p->stats_sem_name, strlen(p) + 8, "/%s.stats", p); } else { printf("ldap-agent: malloc error processing config file\n"); error = 1; From jmagne at fedoraproject.org Wed Apr 22 23:38:27 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 22 Apr 2009 23:38:27 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/locale/en-US esc.properties, 1.7, 1.8 Message-ID: <20090422233827.573F970104@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13799 Modified Files: esc.properties Log Message: Fix for #494981, better error message when use can't re-enroll token. Index: esc.properties =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- esc.properties 7 Jun 2007 21:19:51 -0000 1.7 +++ esc.properties 22 Apr 2009 23:38:20 -0000 1.8 @@ -104,7 +104,8 @@ errorInvalidTokenTypeParams=The Smart Card Server cannot process the requested type of enrollment due to a misconfiguration. errorCannotPublish=The Smart Card Server cannot publish your card's certificates to the certificate directory. errorCommTokenDB=The Smart Card Server cannot connect to its internal database. -errorTokenSuspended=Your smart card has been suspended. +errorTokenSuspended=You are not allowed to perform this operation with this sm +art card. errorPinResetable=You are not allowed to reset the password of this smart card. errorConnLost=The Smart Card Manager has lost the connection to the Smart Card Server. errorEntryTokenDB=The Smart Card Server cannot add your smart card to its internal database. From jmagne at fedoraproject.org Thu Apr 23 22:04:14 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Thu, 23 Apr 2009 22:04:14 +0000 (UTC) Subject: [Fedora-directory-commits] esc/src/lib/coolkey manifest.mn,1.4,1.5 Message-ID: <20090423220414.7CB7470107@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16978 Modified Files: manifest.mn Log Message: Add minor compile flag. Index: manifest.mn =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/manifest.mn,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- manifest.mn 4 Feb 2009 01:43:47 -0000 1.4 +++ manifest.mn 23 Apr 2009 22:04:11 -0000 1.5 @@ -27,7 +27,7 @@ ifndef MOZ_OFFSET MOZ_OFFSET = mozilla-1.7.13 endif -DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss +DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss -fno-strict-aliasing MAPFILE = $(OBJDIR)/ckymanager.def #EXTRA_LIBS += -L$(DIST)/lib -lckyapplet From jmagne at fedoraproject.org Wed Apr 29 20:36:12 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 29 Apr 2009 20:36:12 +0000 (UTC) Subject: [Fedora-directory-commits] esc/win32 setup.iss,1.9,1.10 Message-ID: <20090429203612.0955A70135@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22544 Modified Files: setup.iss Log Message: Get pk11install working. Bug# 497930. Index: setup.iss =================================================================== RCS file: /cvs/dirsec/esc/win32/setup.iss,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- setup.iss 15 Apr 2009 21:47:32 -0000 1.9 +++ setup.iss 29 Apr 2009 20:36:09 -0000 1.10 @@ -111,19 +111,18 @@ Source: BUILD\ESC\xulrunner\mozctl.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\mozctlx.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\xulrunner -Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\PKCS11 +Source: BUILD\libnspr4.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\xulrunner -Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\nssckbi.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\xulrunner -Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\PKCS11 +Source: BUILD\libplc4.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\xulrunner -Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\PKCS11 +Source: BUILD\libplds4.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\README.txt; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\smime3.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\softokn3.chk; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\xulrunner -Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\PKCS11 +Source: BUILD\softokn3.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\ssl3.dll; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\updater.exe; DestDir: {app}\xulrunner Source: BUILD\ESC\xulrunner\xpcom.dll; DestDir: {app}\xulrunner @@ -414,9 +413,6 @@ Source: BUILD\ESC\xulrunner\res\fonts\mathfontSTIXSize1.properties; DestDir: {app}\xulrunner\res\fonts Source: BUILD\ESC\xulrunner\res\html\folder.png; DestDir: {app}\xulrunner\res\html Source: BUILD\ESC\xulrunner\defaults\profile\localstore.rdf; DestDir: {app}\xulrunner\defaults\profile -Source: BUILD\ESC\xulrunner\sqlite3.dll; DestDir: {app}\PKCS11 -Source: BUILD\ESC\xulrunner\mozcrt19.dll; DestDir: {app}\PKCS11 -Source: BUILD\ESC\xulrunner\nssutil3.dll; DestDir: {app}\PKCS11 Source: BUILD\ESC\xulrunner\dictionaries\en-US.aff; DestDir: {app}\dictionaries Source: BUILD\ESC\xulrunner\dictionaries\en-US.dic; DestDir: {app}\dictionaries Source: BUILD\ESC\xulrunner\modules\XPCOMUtils.jsm; DestDir: {app}\modules From jmagne at fedoraproject.org Wed Apr 29 20:38:01 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Wed, 29 Apr 2009 20:38:01 +0000 (UTC) Subject: [Fedora-directory-commits] esc/win32 build.sh,1.8,1.9 Message-ID: <20090429203801.5C73370135@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22979 Modified Files: build.sh Log Message: Get pk11install working. Bug #497930. Index: build.sh =================================================================== RCS file: /cvs/dirsec/esc/win32/build.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.sh 30 Mar 2009 22:03:00 -0000 1.8 +++ build.sh 29 Apr 2009 20:37:59 -0000 1.9 @@ -37,6 +37,8 @@ NSS_ARCHIVE=$NSS_NAME-with-nspr-4.6.4 NSS_SOURCE_URL=https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_4_RTM/src/$NSS_ARCHIVE.tar.gz +NSS_LIB_PATH=$NSS_NAME/mozilla/dist/WIN*/lib + #Inno installer values #INNO_PATH="C:/Program Files/Inno Setup 5/ISCC.exe" @@ -462,6 +464,15 @@ cp esc-image-large.bmp BUILD/ESC/chrome/content/esc + + #Transport the nss files needed for pk11install.exe + + cp $NSS_LIB_PATH/softokn3.dll BUILD + cp $NSS_LIB_PATH/libplc4.dll BUILD + cp $NSS_LIB_PATH/libnspr4.dll BUILD + cp $NSS_LIB_PATH/libplds4.dll BUILD + + # Build the INNO executable installer "$INNO_PATH" setup.iss