upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add KRB_LIBS to makefiles.

Browse source
This commit is contained in:
Kurt Zeilenga 1998-11-25 23:49:12 +00:00
parent e9c9e54703
commit 30cefc46de
11 changed files with 347 additions and 285 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clients/tools/Makefile.in
View file

@ -3,7 +3,8 @@
## ##
SRCS = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c SRCS = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c
OBJS = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o OBJS = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o
#XLIBS = -llber -lldap
XLIBS = $(KRB_LIBS)
LDAP_INCDIR= ../../include LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries

2
clients/ud/Makefile.in
View file

@ -9,7 +9,7 @@ PROGRAMS= ud
LDAP_INCDIR= ../../include LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries
XLIBS = $(TERMCAP_LIBS) XLIBS = $(TERMCAP_LIBS) $(KRB_LIBS)
ud : version.o ud : version.o
$(LTLINK) -o $@ version.o $(OBJS) $(LIBS) $(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

4
clients/ud/string_to_key.c
View file

@ -3,7 +3,7 @@
#if defined(HAVE_KERBEROS) && !defined(openbsd) #if defined(HAVE_KERBEROS) && !defined(openbsd)
/* /*
* $Source: /repo/OpenLDAP/pkg/ldap/clients/ud/string_to_key.c,v $ * $Source: /repo/OpenLDAP/pkg/ldap/clients/ud/string_to_key.c,v $
* $Author: kurt $ * $Author: hallvard $
* *
* Copyright 1985, 1986, 1987, 1988, 1989 by the Massachusetts Institute * Copyright 1985, 1986, 1987, 1988, 1989 by the Massachusetts Institute
* of Technology. * of Technology.
@ -42,7 +42,7 @@ extern void des_fixup_key_parity();
/* /*
* convert an arbitrary length string to a DES key * convert an arbitrary length string to a DES key
*/ */
int void
des_string_to_key( char *str, register des_cblock *key ) des_string_to_key( char *str, register des_cblock *key )
{ {
register char *in_str; register char *in_str;

2
clients/ud/ud.h
View file

@ -261,7 +261,7 @@ void print_one_URL LDAP_P(( char *s, int l_lead, char *tag, int u_lead ));
/* in string_to_key.c: */ /* in string_to_key.c: */
#if defined(HAVE_KERBEROS) && !defined(openbsd) && defined(_AC_KRB_H) #if defined(HAVE_KERBEROS) && !defined(openbsd) && defined(_AC_KRB_H)
#if defined(HAVE_AFS_KERBEROS) || !defined(HAVE_KERBEROS_V) #if defined(HAVE_AFS_KERBEROS) || !defined(HAVE_KERBEROS_V)
int des_string_to_key LDAP_P(( char *str, des_cblock *key )); void des_string_to_key LDAP_P(( char *str, des_cblock *key ));
#endif #endif
#if defined(HAVE_AFS_KERBEROS) #if defined(HAVE_AFS_KERBEROS)
void ka_StringToKey LDAP_P(( char *str, char *cell, des_cblock *key )); void ka_StringToKey LDAP_P(( char *str, char *cell, des_cblock *key ));

605
configure vendored
View file

File diff suppressed because it is too large Load diff

3
configure.in
View file

@ -334,8 +334,9 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then
ol_link_kerberos=yes ol_link_kerberos=yes
AC_DEFINE(HAVE_KERBEROS) AC_DEFINE(HAVE_KERBEROS)
KRB_LIBS="-lkrb -ldes" KRB_LIBS="-lkrb -ldes"
AC_CHECK_FUNCS(des_string_to_key)
fi fi
fi fi
fi fi

3
include/portable.h.in
View file

@ -281,6 +281,9 @@ is provided ``as is'' without express or implied warranty.
/* Define if you have the bcopy function. */ /* Define if you have the bcopy function. */
#undef HAVE_BCOPY #undef HAVE_BCOPY
/* Define if you have the des_string_to_key function. */
#undef HAVE_DES_STRING_TO_KEY
/* Define if you have the flock function. */ /* Define if you have the flock function. */
#undef HAVE_FLOCK #undef HAVE_FLOCK

2
servers/ldapd/Makefile.in
View file

@ -18,7 +18,7 @@ LDAP_LIBDIR= ../../libraries
BUILD_OPT = "--enable-ldapd" BUILD_OPT = "--enable-ldapd"
BUILD_SRV = @BUILD_LDAPD@ BUILD_SRV = @BUILD_LDAPD@
XLIBS= @LDAPD_LIBS@ -llutil @LUTIL_LIBS@ XLIBS= @LDAPD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@
ldapd: version.o ldapd: version.o
$(LDLINK) -o $@ $(OBJS) version.o $(LIBS) $(LDLINK) -o $@ $(OBJS) version.o $(LIBS)

3
servers/slapd/Makefile.in
View file

@ -31,7 +31,8 @@ all-local: FORCE
(cd tools; $(MAKE) $(MFLAGS) all) (cd tools; $(MAKE) $(MFLAGS) all)
XLIBS = @SLAPD_LIBS@ libbackends.a \ XLIBS = @SLAPD_LIBS@ libbackends.a \
-lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ -llutil @LUTIL_LIBS@ -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \
$(KRB_LIBS) -llutil @LUTIL_LIBS@
slapd: version.o slapd: version.o
$(LTLINK) -o $@ $(OBJS) version.o $(LIBS) $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)

3
servers/slapd/tools/Makefile.in
View file

@ -46,7 +46,8 @@ build-ldbm: FORCE
ldbm-tools: $(PROGRAMS) ldbm-tools: $(PROGRAMS)
XLIBS = @SLAPD_LIBS@ -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ -llutil @LUTIL_LIBS@ XLIBS = @SLAPD_LIBS@ -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \
$(KRB_LIBS) -llutil @LUTIL_LIBS@
build-edb2ldif: FORCE build-edb2ldif: FORCE
@if [ "$(HAVE_ISODE)" = "yes" ]; then \ @if [ "$(HAVE_ISODE)" = "yes" ]; then \

2
servers/slurpd/Makefile.in
View file

@ -24,7 +24,7 @@ BUILD_SRV = @BUILD_SLURPD@
all-local: slurpd all-local: slurpd
XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@ -llutil @LUTIL_LIBS@ XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@
slurpd: version.o slurpd: version.o
$(LTLINK) -o $@ $(OBJS) version.o $(LIBS) $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)