From: Anita Zhang <the.anitazha@gmail.com>
Date: Tue, 11 Aug 2020 07:27:54 +0000 (-0700)
Subject: Merge pull request #16690 from poettering/userdb-group-desc
X-Git-Tag: v247-rc1~434
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=96a4ce9f1d4fe5e28dfe04d5002b6e1b04338b67

Merge pull request #16690 from poettering/userdb-group-desc

description field for group records
---

96a4ce9f1d4fe5e28dfe04d5002b6e1b04338b67
diff --cc src/shared/user-record.c
index 2c0de383e04,801de197748..678f04e5374
--- a/src/shared/user-record.c
+++ b/src/shared/user-record.c
@@@ -203,9 -203,10 +203,9 @@@ int json_dispatch_realm(const char *nam
          return 0;
  }
  
- static int json_dispatch_gecos(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
+ int json_dispatch_gecos(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
          char **s = userdata;
          const char *n;
 -        int r;
  
          if (json_variant_is_null(variant)) {
                  *s = mfree(*s);