/[smeserver]/rpms/e-smith-ldap/sme8/e-smith-ldap-5.2.0-ldapmodify.patch
ViewVC logotype

Contents of /rpms/e-smith-ldap/sme8/e-smith-ldap-5.2.0-ldapmodify.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Tue Nov 30 10:43:14 2010 UTC (13 years, 5 months ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-ldap-5_2_0-79_el5_sme, e-smith-ldap-5_2_0-81_el5_sme, e-smith-ldap-5_2_0-72_el5_sme, e-smith-ldap-5_2_0-80_el5_sme, e-smith-ldap-5_2_0-76_el5_sme, e-smith-ldap-5_2_0-71_el5_sme, e-smith-ldap-5_2_0-74_el5_sme, e-smith-ldap-5_2_0-77_el5_sme, e-smith-ldap-5_2_0-75_el5_sme, e-smith-ldap-5_2_0-78_el5_sme, e-smith-ldap-5_2_0-70_el5_sme, e-smith-ldap-5_2_0-73_el5_sme, e-smith-ldap-5_2_0-69_el5_sme, e-smith-ldap-5_2_0-68_el5_sme, HEAD
* Tue Nov 30 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-68.sme
- Use ldapmodify to load ldif, add -a if no changetype [SME: 6413]

1 diff -Nur -x '*.orig' -x '*.rej' e-smith-ldap-5.2.0/root/etc/rc.d/init.d/ldap.init mezzanine_patched_e-smith-ldap-5.2.0/root/etc/rc.d/init.d/ldap.init
2 --- e-smith-ldap-5.2.0/root/etc/rc.d/init.d/ldap.init 2010-11-29 23:21:23.000000000 +0100
3 +++ mezzanine_patched_e-smith-ldap-5.2.0/root/etc/rc.d/init.d/ldap.init 2010-11-29 23:21:20.000000000 +0100
4 @@ -60,8 +60,10 @@
5
6 open (STDERR, "|/usr/bin/logger -p local1.info -t ldap.init");
7 open (STDOUT, ">&STDERR");
8 - exec "/usr/bin/ldapadd", "-c", "-x", "-H", "ldap://localhost/",
9 - "-D", "cn=root,$base", "-w", "$pw";' < $link && /bin/rm $link
10 + my $link = shift || die "Missing filename";
11 + my @add = system("/bin/grep -q changetype $link") == 0 ? () : ("-a");
12 + exec "/usr/bin/ldapmodify", @add, "-c", "-x", "-H", "ldap://localhost/",
13 + "-D", "cn=root,$base", "-w", "$pw", "-f", "$link";' $link && /bin/rm $link
14 ;;
15 *)
16 action "Loading $F into ldap" perl -e '

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed