From kde-commits Sun Mar 07 15:40:03 2004 From: Oswald Buddenhagen Date: Sun, 07 Mar 2004 15:40:03 +0000 To: kde-commits Subject: kdebase/kcontrol/kdm Message-Id: <20040307154003.2D925997F () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=107867400902583 CVS commit by ossi: match defmaxuid determination with genkdmconf M +17 -9 kdm-users.cpp 1.80 --- kdebase/kcontrol/kdm/kdm-users.cpp #1.79:1.80 @@ -51,16 +51,24 @@ KDMUsersWidget::KDMUsersWidget(QWidget * #ifdef __linux__ struct stat st; - if (!stat( "/etc/debian_version", &st ) || !stat( "/usr/portage", &st )) - defminuid = "1000"; // debian, gentoo - else if (!stat( "/etc/mandrake-release", &st )) // check before redhat! - defminuid = "500"; // mandrake - else if (!stat( "/etc/redhat-release", &st )) - defminuid = "100"; // redhat - else //if (!stat( "/etc/SuSE-release", &st )) - defminuid = "500"; // suse + if (!stat( "/etc/debian_version", &st )) { /* debian */ + defminuid = "1000"; + defmaxuid = "29999"; + } else if (!stat( "/usr/portage", &st )) { /* gentoo */ + defminuid = "1000"; + defmaxuid = "65000"; + } else if (!stat( "/etc/mandrake-release", &st )) { /* mandrake - check before redhat! */ + defminuid = "500"; + defmaxuid = "65000"; + } else if (!stat( "/etc/redhat-release", &st )) { /* redhat */ + defminuid = "100"; + defmaxuid = "65000"; + } else /* if (!stat( "/etc/SuSE-release", &st )) */ { /* suse */ + defminuid = "500"; + defmaxuid = "65000"; + } #else defminuid = "1000"; -#endif defmaxuid = "65000"; +#endif // We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,