Initial "gts1" commit.

[tac_plus.git] / ldap_author.c

diff --git a/ldap_author.c b/ldap_author.c
index ca1a8ef..c788e82 100644 (file)
--- a/ldap_author.c
+++ b/ldap_author.c
@@ -1,20 +1,20 @@
 /*
      Verify that this user/password is valid per a database LDAP server
      Return 1 if verified, 0 otherwise.
-     
+
      Format of connection string (look like internet URL):
 
        ldap://LDAP-hostname
-     
+
      -------------------------------------------------------
      patrick.harpes@tudor.lu            http://www.santel.lu
                                         http://www.tudor.lu
-     
+
 
 
      Dependencies: You need to get the OpenLDAP libraries
                    from http://www.openldap.org
- 
+
       License: tac_ldap is free software; you can redistribute it
                and/or modify it under the terms of the GNU General Public License
                as published by the Free Software Foundation; either version 2,
@@ -28,29 +28,38 @@
 Connect format would be:
        ldap://LDAP-hostname:100
 
-Port name isn't required.. I would like to change format with : 
+Port name isn't required.. I would like to change format with :
        ldap://LDAP-hostname:100/dn_for_user&dn_for_passwd
 
- devrim seral <devrim@gazi.edu.tr> 
+ devrim seral <devrim@gazi.edu.tr>
+
+*/
 
-*/ 
 
+#include "tac_plus.h"
+
+#ifdef USE_LDAP
 
-#if defined(USE_LDAP)
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <lber.h>
 #include <ldap.h>
 #include <ldap_cdefs.h>
 
-#include "tac_plus.h"
-#include "ldap.h"
+#include "ldap_author.h"
+#include "main.h"
+#include "utils.h"
+#include "report.h"
+
 
+int ldap_verify TAC_ARGS((const char *user, const char *users_passwd, const char *str_conn));
 
 int
 ldap_verify(user, users_passwd, str_conn)
-char *user, *users_passwd;      /* Username and gived password   */
-char *str_conn;                 /* String connection to database */
+const char *user;              /* username ... */
+const char *users_passwd;      /* ... and given password */
+const char *str_conn;                  /* string connection to database */
 {
   char *buf;
   char *ldapServer;
@@ -59,25 +68,21 @@ char *str_conn;                 /* String connection to database */
   int port;
   int err;
 
-/* Don't allow null username and passwd */ 
+/* Don't allow null username and passwd */
   if ( *user == '0' || *users_passwd == '0' ) return (1);
 
-  buf=(char *)malloc(strlen(str_conn)+1);
-  if (buf == NULL ){ 
-       report(LOG_DEBUG, "Error can't allocate memory");
-        return(1);
-  }
-  
+  buf = (char *) tac_malloc(strlen(str_conn)+1);
+
   strcpy(buf,str_conn);
   ldapServer=strstr(buf, "://");
-  
+
   if(ldapServer == NULL && strlen(ldapServer) <4 ) {
        if (debug) {
                report(LOG_DEBUG, "Error parse ldap server");
                return(1);
        }
-  } 
-  
+  }
+
  ldapServer=ldapServer+3;
 
  ldap_port=(char *)strstr(ldapServer, ":");
@@ -88,8 +93,8 @@ char *str_conn;                 /* String connection to database */
  } else {
        port = LDAP_PORT;
  }
- 
- if ( debug & DEBUG_AUTHEN_FLAG ) 
+
+ if ( debug & DEBUG_AUTHEN_FLAG )
   report(LOG_DEBUG, "In verify_ldap : Before ldap_init : ldapserver = %s port= %d", ldapServer, port);
 
 
@@ -98,22 +103,27 @@ char *str_conn;                 /* String connection to database */
       report(LOG_DEBUG, "Unable to connect to LDAP server:%s port:%d",ldapServer, port);
       return 1;
     }
-  
-  err=ldap_simple_bind_s(ld, user, users_passwd);
-  
+
+  err=ldap_simple_bind_s(ld, (/* de-const */ char *) user, (/* de-const */ char *) users_passwd);
+
   if(err != LDAP_SUCCESS)
     {
-      if ( debug & DEBUG_AUTHEN_FLAG ) 
+      if ( debug & DEBUG_AUTHEN_FLAG )
        report(LOG_DEBUG,"Error while bind : %d %s",err, ldap_err2string(err) );
       return 1;
-    }         
+    }
   else
     {
       /* Success */
-     if ( debug & DEBUG_AUTHEN_FLAG ) 
+     if ( debug & DEBUG_AUTHEN_FLAG )
                report(LOG_DEBUG, "LDAP authentication Sucess ");
-     ldap_unbind_s(ld); 
+     ldap_unbind_s(ld);
      return 0;
     }
 }
-#endif /* LDAP */
+
+#else /* USE_LDAP */
+
+TAC_SOURCEFILE_EMPTY
+
+#endif /* USE_LDAP */