]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
conf-parser: when the empty string assigned to Personality= reset it 6826/head
authorLennart Poettering <lennart@poettering.net>
Thu, 14 Sep 2017 14:54:32 +0000 (16:54 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 14 Sep 2017 14:54:32 +0000 (16:54 +0200)
Let's support assigning the empty string to reset things in one more
place.

src/shared/conf-parser.c

index c0afe4557779467ee47a1a65f61acbef354c81e6..a84b61243e0e9ffb0de4cece9a6d164d0ec4dd6a 100644 (file)
@@ -916,10 +916,14 @@ int config_parse_personality(
         assert(rvalue);
         assert(personality);
 
-        p = personality_from_string(rvalue);
-        if (p == PERSONALITY_INVALID) {
-                log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse personality, ignoring: %s", rvalue);
-                return 0;
+        if (isempty(rvalue))
+                p = PERSONALITY_INVALID;
+        else {
+                p = personality_from_string(rvalue);
+                if (p == PERSONALITY_INVALID) {
+                        log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse personality, ignoring: %s", rvalue);
+                        return 0;
+                }
         }
 
         *personality = p;