Changeset f32d557


Ignore:
Timestamp:
2006-03-24T15:53:29Z (14 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
d5dfc3d
Parents:
728a981
Message:

Switch from LDB to LDAP (LDB's authentication subsystem is not mature enough yet)

Files:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r728a981 rf32d557  
    1414subdirs = protocols
    1515
    16 objects += $(LDB_OBJ)
     16objects += $(LDAP_OBJ)
    1717
    1818# Expansion of variables
  • configure

    r728a981 rf32d557  
    2828strip=1
    2929ipv6=1
    30 ldb=auto
     30ldap=auto
    3131ssl=auto
    3232
     
    6565--ipv6=0/1      IPv6 socket support                     $ipv6
    6666
    67 --ldb=0/1/auto  LDB support                             $ldb
     67--ldap=0/1/auto LDAP support                            $ldap
    6868
    6969--ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
     
    224224}
    225225
    226 detect_ldb()
     226detect_ldap()
    227227{
    228228        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG ldb; then
     
    231231CFLAGS+=`$PKG_CONFIG --cflags ldb`
    232232EOF
    233                 ldb=1
     233                ldap=1
    234234                ret=1
    235235        else
     
    298298fi
    299299
    300 if [ "$ldb" = "auto" ]; then
    301         detect_ldb
    302 fi
    303 
    304 if [ "$ldb" = 0 ]; then
    305         echo "LDB_OBJ=\# no ldb" >> Makefile.settings
    306         echo "#undef LDB" >> config.h
    307 elif [ "$ldb" = 1 ]; then
    308         echo "#define LDB 1" >> config.h
    309         echo "LDB_OBJ=storage_ldb.o" >> Makefile.settings
     300if [ "$ldap" = "auto" ]; then
     301        detect_ldap
     302fi
     303
     304if [ "$ldap" = 0 ]; then
     305        echo "LDAP_OBJ=\# no ldap" >> Makefile.settings
     306        echo "#undef LDAP" >> config.h
     307elif [ "$ldap" = 1 ]; then
     308        echo "#define LDAP 1" >> config.h
     309        echo "LDAP_OBJ=storage_ldap.o" >> Makefile.settings
    310310fi
    311311
     
    461461fi
    462462
    463 if [ "$ldb" = "0" ]; then
    464         echo "  LDB storage backend disabled."
    465 else
    466         echo "  LDB storage backend enabled."
    467 fi
     463if [ "$ldap" = "0" ]; then
     464        echo "  LDAP storage backend disabled."
     465else
     466        echo "  LDAP storage backend enabled."
     467fi
Note: See TracChangeset for help on using the changeset viewer.