]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #16690 from poettering/userdb-group-desc
authorAnita Zhang <the.anitazha@gmail.com>
Tue, 11 Aug 2020 07:27:54 +0000 (00:27 -0700)
committerGitHub <noreply@github.com>
Tue, 11 Aug 2020 07:27:54 +0000 (00:27 -0700)
description field for group records

1  2 
TODO
src/shared/user-record.c

diff --cc TODO
Simple merge
index 2c0de383e042316623a97cb6fecd9c58e7e2c45b,801de197748ecfb1d316f741af6f52f1b364ce9c..678f04e53747ceec718d563164d4cf38fd746155
@@@ -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);