[Serverfilters-commit] serversidefilter/script Makefile.ldap,1.2,1.3 filtercmd.c,1.4,1.5

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4327

Modified Files:
	Makefile.ldap filtercmd.c 
Log Message:
Fixes to get LDAP working

Index: Makefile.ldap
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.ldap,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.ldap	21 May 2005 19:46:19 -0000	1.2
--- Makefile.ldap	21 Jul 2005 07:10:26 -0000	1.3
***************
*** 157,162 ****
  # Change these as needed if you are using LDAP functionality
  #
! LDAP_FLAGS=-I/usr/include
! LDAP_LDFLAGS=-L/usr/lib 
  
  # Point this to the LDAP configuration file
--- 157,162 ----
  # Change these as needed if you are using LDAP functionality
  #
! LDAP_FLAGS=-I/usr/local/include
! LDAP_LDFLAGS=-L/usr/local/lib  -lldap -llber
  
  # Point this to the LDAP configuration file
***************
*** 199,203 ****
  
  mdldapconfig.o: ldap/mdldapconfig.c Makefile
! 	gcc -c mysql/mdldapconfig.c $(CFLAGS)
  
  test: test.sh filtercmd
--- 199,203 ----
  
  mdldapconfig.o: ldap/mdldapconfig.c Makefile
! 	gcc -c ldap/mdldapconfig.c $(CFLAGS)
  
  test: test.sh filtercmd

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/script/filtercmd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** filtercmd.c	17 Jun 2005 07:29:46 -0000	1.4
--- filtercmd.c	21 Jul 2005 07:10:26 -0000	1.5
***************
*** 805,817 ****
  
          mdldapconfig *ldapcfg = NULL;
  
          // Read the config
          ldapcfg = (mdldapconfig*)get_ldap_config(LDAPCONFIG);
          if ( ldapcfg )
!           if ( !(ldapcfg->hostname && ldapcfg->database && ldapcfg->dbtable) )
                return ERR_LDAP_CONFIG_FILE_INCOMPLETE;
  
          // Find the user
-         mdldaprec *mrec = NULL;
          mrec = get_user_ldap(ldapcfg,(char*)user);
          if ( mrec ) {
--- 805,817 ----
  
          mdldapconfig *ldapcfg = NULL;
+         mdldaprec *mrec = NULL;
  
          // Read the config
          ldapcfg = (mdldapconfig*)get_ldap_config(LDAPCONFIG);
          if ( ldapcfg )
!           if ( !(ldapcfg->hostname) )
                return ERR_LDAP_CONFIG_FILE_INCOMPLETE;
  
          // Find the user
          mrec = get_user_ldap(ldapcfg,(char*)user);
          if ( mrec ) {
***************
*** 823,827 ****
              *uid = mrec->uidnumber;
              *gid = mrec->gidnumber;
!             strncpy(home, mrec->homedir, buflen);
  
              free_ldap_rec(&mrec);
--- 823,827 ----
              *uid = mrec->uidnumber;
              *gid = mrec->gidnumber;
!             strncpy(home, mrec->homedirectory, buflen);
  
              free_ldap_rec(&mrec);