BF: CS-886: qresub fails for jobs that are part of the defaultdepartment

Author: ernst-bablick

doc/markdown/man/man5/sge_access_list.md

@@ -41,6 +41,11 @@ Allows to submit, control and delete advance reservations (see qsub(1)).
 
 Allows to specify a deadline for jobs (see qsub(1) -dl).
 
+## defaultdepartment
+
+The *defaultdepartment* is the default department for users that are not assigned to any other department.
+In difference to other departments, users or groups of users must not explicitly be referenced in the *entries* field of the *defaultdepartment* so that a user can be part of the *defaultdepartment*.
+
 # FORMAT
 
 The following list of access list parameters specifies the access list content:

source/daemons/qmaster/sge_userset_qmaster.cc

@@ -289,6 +289,13 @@ bool
 job_is_valid_department(lListElem *job, lList **alpp, const char *dept_name, const lList *userset_list) {
    DENTER(TOP_LAYER);
 
+   // Do we have a department name?
+   if (dept_name == nullptr) {
+      ERROR(MSG_JOB_NODEPTFOUND);
+      answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
+      DRETURN(false);
+   }
+
    // Does the department exist?
    const lListElem *dept = lGetElemStr(userset_list, US_name, dept_name);
    if (!dept || !(lGetUlong(dept, US_type) & US_DEPT)) {
@@ -299,6 +306,12 @@ job_is_valid_department(lListElem *job, lList **alpp, const char *dept_name, con
       DRETURN(false);
    }
 
+   // Is the department name the default department then we can skip remaining tests.
+   // The default department is always valid and the user or group(s) do not need to be part of it.
+   if (!strcmp(dept_name, DEFAULT_DEPARTMENT)) {
+      DRETURN(true);
+   }
+
    // Does the user belong to the department?
    const char *owner = lGetString(job, JB_owner);
    if (sge_contained_in_access_list(owner, nullptr, nullptr, dept)) {