No commit message

ADReportUsers.cpp

@@ -71,62 +71,76 @@ int main (int argc, char *argv[])
               param = argv[i] + 2;
             else if (i + 1 < argc && argv[i + 1])
               param = argv[++i];
-            if (!param)
-              return false;
+            if (!param) {
+              paramerror = true;
+              break;
+	    }
             dstformat = strdup(param);
             break;
           case 'o' :
             if (argv[i][2])
               param = argv[i] + 2;
             else if (i + 1 < argc && argv[i + 1])
               param = argv[++i];
-            if (!param)
-              return false;
+            if (!param) {
+              paramerror = true;
+              break;
+	    }
             dstfilename = strdup(param);
             break;
           case 'g' :
             if (argv[i][2])
               param = argv[i] + 2;
             else if (i + 1 < argc && argv[i + 1])
               param = argv[++i];
-            if (!param)
-              return false;
+            if (!param) {
+              paramerror = true;
+              break;
+	    }
             groups.push_back(param);
             break;
           case 'c' :
             if (argv[i][2])
               param = argv[i] + 2;
             else if (i + 1 < argc && argv[i + 1])
               param = argv[++i];
-            if (!param)
-              return false;
+            if (!param) {
+              paramerror = true;
+              break;
+	    }
             createdlastdays = atoi(param);
             break;
           case 'x' :
             if (argv[i][2])
               param = argv[i] + 2;
             else if (i + 1 < argc && argv[i + 1])
               param = argv[++i];
-            if (!param)
-              return false;
+            if (!param) {
+              paramerror = true;
+              break;
+	    }
             expiresnextdays = atoi(param);
             break;
           case 'l' :
             if (argv[i][2])
               param = argv[i] + 2;
             else if (i + 1 < argc && argv[i + 1])
               param = argv[++i];
-            if (!param)
-              return false;
+            if (!param) {
+              paramerror = true;
+              break;
+	    }
             loggedonlastdays = atoi(param);
             break;
           case 'n' :
             if (argv[i][2])
               param = argv[i] + 2;
             else if (i + 1 < argc && argv[i + 1])
               param = argv[++i];
-            if (!param)
-              return false;
+            if (!param) {
+              paramerror = true;
+              break;
+	    }
             changedpasswordlastdays = atoi(param);
             break;
           case 'e' :
@@ -143,8 +157,10 @@ int main (int argc, char *argv[])
               param = argv[i] + 2;
             else if (i + 1 < argc && argv[i + 1])
               param = argv[++i];
-            if (!param)
-              return false;
+            if (!param) {
+              paramerror = true;
+              break;
+	    }
             ldapfilter = param;
             break;
           default :

Changelog.txt

@@ -1,3 +1,6 @@
+2023-01-14 - version 1.4.8
+ - fixes issues in ADReportUsers.cpp: can't return false in main()
+
 2021-01-20 - version 1.4.7
  - fixes for OpenLDAP compatibility
  - fixes for handling int64_t types

adreports_version.h

@@ -10,7 +10,7 @@
 /*! \brief minor version number */
 #define ADREPORTS_VERSION_MINOR 4
 /*! \brief micro version number */
-#define ADREPORTS_VERSION_MICRO 7
+#define ADREPORTS_VERSION_MICRO 8
 /*! @} */
 
 /*! \cond PRIVATE */
@@ -22,6 +22,6 @@
 #define ADREPORTS_VERSION_STRING ADREPORTS_VERSION_STRINGIZE(ADREPORTS_VERSION_MAJOR, ADREPORTS_VERSION_MINOR, ADREPORTS_VERSION_MICRO)
 
 /*! \brief string with information about author \hideinitializer */
-#define ADREPORTS_CREDITS "Brecht Sanders 2011-2020"
+#define ADREPORTS_CREDITS "Brecht Sanders 2011-2023"
 
 #endif