Define UID_MIN and UID_MAX in CMake instead of hardcoding

jleclanche · jleclanche · commit 32b37fdd7070 · 2015-06-21T08:48:23.000+02:00
References #230
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -145,6 +145,14 @@ set(LOG_FILE                    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.lo
 set(DBUS_CONFIG_FILENAME        "org.freedesktop.DisplayManager.conf"               CACHE STRING    "Name of the sddm config file")
 set(COMPONENTS_TRANSLATION_DIR  "${DATA_INSTALL_DIR}/translations"                  CACHE PATH      "Components translations directory")
 
+if(NOT DEFINED UID_MIN)
+    set(UID_MIN 1000 CACHE STRING "UID_MIN from login.defs (MinimumUid)")
+endif()
+
+if(NOT DEFINED UID_MAX)
+    set(UID_MAX 65000 CACHE STRING "UID_MAX from login.defs (MaximumUid)")
+endif()
+
 # Add subdirectories
 add_subdirectory(components)
 add_subdirectory(data)
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
@@ -73,8 +73,8 @@ namespace SDDM {
         );
         Section(Users,
             Entry(DefaultPath,         QString,     _S("/bin:/usr/bin:/usr/local/bin"),         _S("Default $PATH"));
-            Entry(MinimumUid,          int,         1000,                                       _S("Minimum user id for displayed users"));
-            Entry(MaximumUid,          int,         65000,                                      _S("Maximum user id for displayed users"));
+            Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+            Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
             Entry(HideUsers,           QStringList, QStringList(),                              _S("Hidden users"));
             Entry(HideShells,          QStringList, QStringList(),                              _S("Hidden shells\n"
                                                                                                    "Users with these shells as their default won't be listed"));
diff --git a/src/common/Constants.h.in b/src/common/Constants.h.in
@@ -36,6 +36,9 @@
 #define LOG_FILE                    "@LOG_FILE@"
 #define MINIMUM_VT                  @MINIMUM_VT@
 
+#define UID_MIN                     @UID_MIN@
+#define UID_MAX                     @UID_MAX@
+
 #define HALT_COMMAND "@HALT_COMMAND@"
 #define REBOOT_COMMAND "@REBOOT_COMMAND@"
 
