Changeset 23252

Timestamp:

05/10/07 15:34:45 (19 months ago)

Author:

zarzycki@…

Message:

Some developers seem to be just making up keys...

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (11 diffs)
• liblaunch_private.h (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -1160 +1160 @@
 job_import_bool(job_t j, const char *key, bool value)
 {
+        bool found_key = false;
+
         switch (key[0]) {
         case 'k':
@@ -1165 +1167 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_KEEPALIVE) == 0) {
                         j->ondemand = !value;
+                        found_key = true;
                 }
                 break;
@@ -1171 +1174 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_ONDEMAND) == 0) {
                         j->ondemand = value;
+                        found_key = true;
                 }
                 break;
@@ -1177 +1181 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_DEBUG) == 0) {
                         j->debug = value;
+                        found_key = true;
+                } else if (strcasecmp(key, LAUNCH_JOBKEY_DISABLED) == 0) {
+                        job_assumes(j, !value);
+                        found_key = true;
                 }
                 break;
@@ -1183 +1191 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_HOPEFULLYEXITSLAST) == 0) {
                         j->hopefully_exits_last = value;
+                        found_key = true;
                 } else if (strcasecmp(key, LAUNCH_JOBKEY_HOPEFULLYEXITSFIRST) == 0) {
                         j->hopefully_exits_first = value;
+                        found_key = true;
                 }
                 break;
@@ -1191 +1201 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_SESSIONCREATE) == 0) {
                         j->session_create = value;
+                        found_key = true;
                 } else if (strcasecmp(key, LAUNCH_JOBKEY_STARTONMOUNT) == 0) {
                         j->start_on_mount = value;
+                        found_key = true;
+                } else if (strcasecmp(key, LAUNCH_JOBKEY_SERVICEIPC) == 0) {
+                        /* this only does something on Mac OS X 10.4 "Tiger" */
+                        found_key = true;
                 }
                 break;
@@ -1199 +1214 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_LOWPRIORITYIO) == 0) {
                         j->low_pri_io = value;
+                        found_key = true;
                 } else if (strcasecmp(key, LAUNCH_JOBKEY_LAUNCHONLYONCE) == 0) {
                         j->only_once = value;
+                        found_key = true;
                 }
                 break;
@@ -1211 +1228 @@
                         }
                         j->no_init_groups = !value;
+                        found_key = true;
                 }
                 break;
@@ -1217 +1235 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_RUNATLOAD) == 0) {
                         j->runatload = value;
+                        found_key = true;
                 }
                 break;
@@ -1223 +1242 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_ENABLEGLOBBING) == 0) {
                         j->globargv = value;
+                        found_key = true;
                 } else if (strcasecmp(key, LAUNCH_JOBKEY_ENTERKERNELDEBUGGERBEFOREKILL) == 0) {
                         j->debug_before_kill = value;
+                        found_key = true;
                 }
                 break;
@@ -1231 +1252 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_WAITFORDEBUGGER) == 0) {
                         j->wait4debugger = value;
+                        found_key = true;
                 }
                 break;
         default:
+                break;
+        }
+
+        if (!found_key) {
                 job_log(j, LOG_WARNING, "Unknown key for boolean: %s", key);
-                break;
         }
 }

trunk/launchd/src/liblaunch_private.h

@@ -48 +48 @@
 #define LAUNCH_JOBKEY_ENTERKERNELDEBUGGERBEFOREKILL     "EnterKernelDebuggerBeforeKill"
 #define LAUNCH_JOBKEY_PERJOBMACHSERVICES        "PerJobMachServices"
+#define LAUNCH_JOBKEY_SERVICEIPC                "ServiceIPC"
 
 #define LAUNCH_JOBKEY_MACH_KUNCSERVER   "kUNCServer"