8 files changed, 140 insertions, 57 deletions

diff --git a/include/ldaputils.h b/include/ldaputils.h
index 7dbed22..92fe64e 100644
--- a/include/ldaputils.h
+++ b/include/ldaputils.h
@@ -118,7 +118,7 @@ typedef struct ldaputils_config_struct   LDAPUtils;
 struct ldaputils_config_struct
 {
    LDAP         * ld;                          ///< LDAP descriptor
-   LDAPURLDesc  * ludp;                        ///< LDAP URL descriptor
+   char         * prog_name;                   ///< program name
    int            continuous;                  // -c continuous operation mode
    long           debug;                       // -d debug level
    int            dryrun;                      // -n dry run mode
@@ -139,7 +139,6 @@ struct ldaputils_config_struct
    const char   * passfile;                      // -y password file
    const char   * sortattr;                      // -S sort by attribute
    const char   * uri;                         // -H LDAP URI
-   const char   * prog_name;                   // name of calling program
 };
 
 
@@ -159,9 +158,6 @@ int ldaputils_cmdargs(LDAPUtils * cnf, int c, const char * arg);
 // frees common config
 void ldaputils_config_free(LDAPUtils * cnf);
 
-// initializes the common config
-void ldaputils_config_init(LDAPUtils * cnf, const char * prog_name);
-
 // prints configuration to stdout
 void ldaputils_config_print(LDAPUtils * cnf);
 
@@ -262,6 +258,9 @@ char * ldaputils_get_vals(LDAPUtils * cnf, LDAPUtilsEntry * entry,
    const char * attr);
 
 // connects and binds to LDAP server
+int ldaputils_initialize(LDAPUtils ** lup, const char * prog_name);
+
+// connects and binds to LDAP server
 LDAP * ldaputils_initialize_conn(LDAPUtils * cnf);
 
 // connects and binds to LDAP server
diff --git a/lib/libldaputils/lconfig.c b/lib/libldaputils/lconfig.c
index be683f7..30c10a5 100644
--- a/lib/libldaputils/lconfig.c
+++ b/lib/libldaputils/lconfig.c
@@ -177,22 +177,6 @@ void ldaputils_config_free(LDAPUtils * cnf)
    if (!(cnf))
       return;
 
-   if (cnf->ludp)
-      ldap_free_urldesc(cnf->ludp);
-   cnf->ludp = NULL;
-
-   return;
-}
-
-
-/// initializes the common config
-/// @param[in] cnf  reference to common configuration struct
-void ldaputils_config_init(LDAPUtils * cnf, const char * prog_name)
-{
-   memset(cnf, 0, sizeof(LDAPUtils));
-   cnf->referrals  = 0;
-   cnf->scope      = LDAP_SCOPE_SUBTREE;
-   cnf->prog_name  = prog_name;
    return;
 }
 
diff --git a/lib/libldaputils/lconfig_opts.c b/lib/libldaputils/lconfig_opts.c
index 91cf362..5fc6583 100644
--- a/lib/libldaputils/lconfig_opts.c
+++ b/lib/libldaputils/lconfig_opts.c
@@ -53,6 +53,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
+#include <assert.h>
 
 
 /////////////////
@@ -239,28 +240,9 @@ int ldaputils_config_set_timelimit(LDAPUtils * cnf, const char * arg)
 /// @param[in] arg   value of the command line argument
 int ldaputils_config_set_uri(LDAPUtils * cnf, const char * arg)
 {
-   if ((cnf->ludp))
-   {
-      if (cnf->host == cnf->ludp->lud_host)
-         cnf->host = NULL;
-      ldap_free_urldesc(cnf->ludp);
-   };
-   cnf->ludp = NULL;
-   
-   if (!(cnf->uri = arg))
-      return(0);
-   
-   if ((ldap_url_parse(arg, &cnf->ludp)))
-   {
-      // TRANSLATORS: The following strings provide an error message if the
-      // URI provided on the command line is an invalid LDAP URI.
-      fprintf(stderr, "%s: invalid LDAP URI\n", cnf->prog_name);
-      fprintf(stderr, "Try `%s --help' for more information.\n", cnf->prog_name);
-      return(1);
-   };
-   
-   cnf->host  = cnf->ludp->lud_host;
-   cnf->port  = cnf->ludp->lud_port;
+
+   assert(cnf != NULL);
+   assert(arg != NULL);
    
    return(0);
 }
diff --git a/lib/libldaputils/lmemory.c b/lib/libldaputils/lmemory.c
index 9e0cb90..78b68f5 100644
--- a/lib/libldaputils/lmemory.c
+++ b/lib/libldaputils/lmemory.c
@@ -48,8 +48,10 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <ldap.h>
 #include <stdlib.h>
+#include <assert.h>
 
 
 /////////////////
@@ -58,5 +60,44 @@
 //             //
 /////////////////
 
+// connects and binds to LDAP server
+int ldaputils_initialize(LDAPUtils ** lup, const char * prog_name)
+{
+   int         rc;
+   char      * idx;
+   LDAPUtils * lu;
+
+   assert(lup       != NULL);
+   assert(prog_name != NULL);
+
+
+   // allocate initial memory for base struct
+   if ((lu = malloc(sizeof(LDAPUtils))) == NULL)
+      return(LDAP_NO_MEMORY);
+   bzero(lu, sizeof(LDAPUtils));
+
+
+   // save program name
+   if ((idx = rindex(prog_name, '/')) != NULL)
+      if (idx[1] != '\0')
+         prog_name = &idx[1];
+   if ((lu->prog_name = strdup(prog_name)) == NULL)
+   {
+      free(lu);
+      return(LDAP_NO_MEMORY);
+   };
+
+
+   // initialize LDAP library
+   if ((rc = ldap_initialize(&lu->ld, NULL)) != LDAP_SUCCESS)
+   {
+      free(lu->prog_name);
+      free(lu);
+      return(rc);
+   };
+
+
+   return(LDAP_SUCCESS);
+}
 
 /* end of source file */
diff --git a/lib/libldaputils/lmemory.h b/lib/libldaputils/lmemory.h
index 7f7e2bb..ac232f5 100644
--- a/lib/libldaputils/lmemory.h
+++ b/lib/libldaputils/lmemory.h
@@ -46,7 +46,7 @@
 //           //
 ///////////////
 
-#include <ldaputils.h>
+#include "libldaputils.h"
 
 
 ///////////////////
diff --git a/src/ldap2csv.c b/src/ldap2csv.c
index 5a1f8dc..b779cfc 100644
--- a/src/ldap2csv.c
+++ b/src/ldap2csv.c
@@ -102,7 +102,7 @@
 typedef struct my_config MyConfig;
 struct my_config
 {
-   LDAPUtils   common;
+   LDAPUtils   * common;
    char              output[LDAPUTILS_OPT_LEN];
 };
 
@@ -157,7 +157,7 @@ int main(int argc, char * argv[])
    if (!(cnf))
       return(0);
    
-   if (!(ld = ldaputils_initialize_conn(&cnf->common)))
+   if (!(ld = ldaputils_initialize_conn(cnf->common)))
    {
       ldaputils_config_free((LDAPUtils *)cnf);
       free(cnf);
@@ -173,12 +173,12 @@ int main(int argc, char * argv[])
    };
 
    // prints attribute names
-   printf("\"%s\"", cnf->common.attrs[0]);
-   for(x = 1; cnf->common.attrs[x]; x++)
-      printf(",\"%s\"", cnf->common.attrs[x]);
+   printf("\"%s\"", cnf->common->attrs[0]);
+   for(x = 1; cnf->common->attrs[x]; x++)
+      printf(",\"%s\"", cnf->common->attrs[x]);
    printf("\n");
 
-   if (!(entries = ldaputils_get_entries(&cnf->common, ld, res, ((LDAPUtils *)cnf)->sortattr)))
+   if (!(entries = ldaputils_get_entries(cnf->common, ld, res, ((LDAPUtils *)cnf)->sortattr)))
    {
       ldap_msgfree(res);
       ldap_unbind_ext_s(ld, NULL, NULL);
@@ -192,9 +192,9 @@ int main(int argc, char * argv[])
    
    for(x = 0; entries[x]; x++)
    {
-      for(y = 0; cnf->common.attrs[y]; y++)
+      for(y = 0; cnf->common->attrs[y]; y++)
       {
-         if (!(val = ldaputils_get_vals(&cnf->common, entries[x], cnf->common.attrs[y])))
+         if (!(val = ldaputils_get_vals(cnf->common, entries[x], cnf->common->attrs[y])))
          {
                ldap_msgfree(res);
                ldap_unbind_ext_s(ld, NULL, NULL);
@@ -252,7 +252,7 @@ int my_config(int argc, char * argv[], MyConfig ** cnfp)
    };
    memset(cnf, 0, sizeof(MyConfig));
    
-   ldaputils_config_init((LDAPUtils *) cnf, PROGRAM_NAME);
+   ldaputils_initialize(&cnf->common, PROGRAM_NAME);
 
    // loops through args
    while((c = getopt_long(argc, argv, short_options, long_options, &option_index)) != -1)
@@ -280,17 +280,17 @@ int my_config(int argc, char * argv[], MyConfig ** cnfp)
       return(1);
    };
    
-   cnf->common.filter = argv[optind];
+   cnf->common->filter = argv[optind];
 
    // configures LDAP attributes to return in results
-   if (!(cnf->common.attrs = (char **) malloc(sizeof(char *) * (size_t)(argc-optind))))
+   if (!(cnf->common->attrs = (char **) malloc(sizeof(char *) * (size_t)(argc-optind))))
    {
       fprintf(stderr, "%s: out of virtual memory\n", PROGRAM_NAME);
       return(1);
    };
    for(c = 0; c < (argc-optind-1); c++)
-      cnf->common.attrs[c] = argv[optind+1+c];
-   cnf->common.attrs[c] = 0;
+      cnf->common->attrs[c] = argv[optind+1+c];
+   cnf->common->attrs[c] = 0;
    
    *cnfp = cnf;
 
diff --git a/tests/ldaptest.c b/tests/ldaptest.c
new file mode 100644
index 0000000..70d9723
--- /dev/null
+++ b/tests/ldaptest.c
@@ -0,0 +1,47 @@
+
+#include <stdio.h>
+#include <stdio.h>
+#include <ldap.h>
+
+int main(void);
+int main(void)
+{
+   int            opt;
+   int            lerr;
+   int            count;
+   LDAP         * ld;
+   LDAPMessage  * res;
+   //LDAPMessage  * entry;
+
+   printf("running: ldap_initialize()\n");
+   if (ldap_initialize(&ld, NULL))
+   {
+      perror("ldap_initialize()");
+      return(1);
+   };
+
+   opt = 0xffff;
+   ldap_set_option(ld, LDAP_OPT_DEBUG_LEVEL, &opt);
+
+   printf("running: ldap_search_ext_s()\n");
+   if ((lerr = ldap_search_ext_s(ld, NULL, LDAP_SCOPE_SUB, "(mail=syzdek@mosquitonet.com)", NULL, 0, NULL, NULL, NULL, -1, &res)))
+   {
+      fprintf(stderr, "ldap_search_ext_s(): %s\n", ldap_err2string(lerr));
+      ldap_unbind_ext_s(ld, NULL, NULL);
+      return(1);
+   };
+
+   printf("running: ldap_count_entries()\n");
+   if (!(count = ldap_count_entries(ld, res)))
+   {
+      ldap_msgfree(res);
+      ldap_unbind_ext_s(ld, NULL, NULL);
+      return(1);
+   };
+   printf("# %i entries found\n", count);
+
+   printf("running: ldap_unbind_ext_s()\n");
+   ldap_unbind_ext_s(ld, NULL, NULL);
+
+   return(0);
+}
diff --git a/tests/readline.c b/tests/readline.c
new file mode 100644
index 0000000..a27de67
--- /dev/null
+++ b/tests/readline.c
@@ -0,0 +1,30 @@
+
+#include <stdio.h>
+#include <string.h>
+#include <readline/readline.h>
+#include <readline/history.h>
+
+int main(void);
+
+int main(void)
+{
+   char * data;
+   char * old;
+
+   data = strdup("");
+
+   while(strcmp(data, "exit"))
+   {
+      old = data;
+      printf("Enter text [%s]: ", data);
+      data = readline(NULL);
+      if(!(strlen(data)))
+         data = old;
+      else
+         free(old);
+      printf("you typed: %s\n", data);
+      old = data;
+   };
+
+   return(0);
+}