ITS #2763 applicable to 2.1.26?

[Jeff Leung <jeffleung@mac.com>]

Hi,

I just recently upgraded my development box to Mac OS X 10.3. Seems that I
am no longer able to build openldap 2.1.26. Instead I get the following
error:

  cc -g -O2 -I../../include -I../../include
   -I/ms/svc/psi/sw/BerkeleyDB.4.2/include -DLDAP_LIBRARY -c dnssrv.c
   -fno-common -DPIC -o .libs/dnssrv.lo
  dnssrv.c: In function `ldap_domain2hostlist':
  dnssrv.c:203: error: `C_IN' undeclared (first use in this function)
  dnssrv.c:203: error: (Each undeclared identifier is reported only once
  dnssrv.c:203: error: for each function it appears in.)
  dnssrv.c:213: error: `HEADER' undeclared (first use in this function)
  make[2]: *** [dnssrv.lo] Error 1
  make[1]: *** [all-common] Error 1
  make: *** [all-common] Error 1

Looks like the same exact issue was reported in ITS#2763 for openldap 2.2
and that the problem was corrected in HEAD. However, I tried applying the
patch I downloaded from
http://homepage.mac.com/townsend/openldap-patches/libraries-libldap.patch,
but I get the following error:

  % patch -p0 < libraries-libldap.patch
  patching file libraries/libldap/dnssrv.c
  Hunk #1 succeeded at 200 with fuzz 2 (offset -3 lines).
  Hunk #2 FAILED at 214.
  1 out of 2 hunks FAILED -- saving rejects to file
   libraries/libldap/dnssrv.c.rej
  Exit 1

Now, what I'd like to do instead is to patch the dnssrv.c that I have
(1.15.2.9) with whatever I should be using. Question is, which version of
libraries/libldap/dnssrv.c is the most current that can be used with
OpenLDAP 2.1.26 (or 2.1.x for that matter)?

Thanks.
-- 
Jeff
// Diplomacy is the art of saying 'nice doggy'
// until you can find a rock.

-- 
Jeff Leung
Earthlink, Inc. -- Application & Aggregation Services
leungj3@corp.earthlink.net