ldap2csv: adjusting CLI argument checks to require attribute if providing optional filter

1 files changed, 11 insertions, 8 deletions

diff --git a/src/ldap2csv.c b/src/ldap2csv.c
index 1308b07..7faf38e 100644
--- a/src/ldap2csv.c
+++ b/src/ldap2csv.c
@@ -311,6 +311,17 @@ int my_config(int argc, char * argv[], MyConfig ** cnfp)
 
    cnf->prog_name = ldaputils_get_prog_name(cnf->lud);
 
+   // saves filter
+   if (argc > optind)
+   {
+      cnf->lud->filter = "(objectclass=*)";
+      if ((index(argv[optind], '=')) != NULL)
+      {
+         cnf->lud->filter = argv[optind];
+         optind++;
+      };
+   };
+
    // checks for required arguments
    if (argc < (optind+1))
    {
@@ -320,14 +331,6 @@ int my_config(int argc, char * argv[], MyConfig ** cnfp)
       return(1);
    };
 
-   // saves filter
-   cnf->lud->filter = "(objectclass=*)";
-   if ((index(argv[optind], '=')) != NULL)
-   {
-      cnf->lud->filter = argv[optind];
-      optind++;
-   };
-
    // configures LDAP attributes to return in results
    len  = (size_t)(argc - optind) + 1;
    size = sizeof(char *) * len;