commit 9e538263a0f48c147a5ffe7691567cf35a1e3e5f · pyrox.dev/nixpkgs

-1

nixos/modules/services/misc/sssd.nix

···

       21
       21
        
               description = "Contents of {file}`sssd.conf`.";

     

       22
       22
        
               default = ''

     

       23
       23
        
                 [sssd]

     

       24
       24
       -
                 config_file_version = 2

     

       25
       24
        
                 services = nss, pam

     

       26
       25
        
                 domains = shadowutils

     

       27
       26

+12

pkgs/os-specific/linux/sssd/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         replaceVars,

     

       5
       6
        
         autoreconfHook,

     

       6
       7
        
         makeWrapper,

     

       7
       8
        
         glibc,

     
···

       72
       73
        
           hash = "sha256-JN4GVx5rBfNBLaMpLcKgyd+CyNDafz85BXUcfg5kDXQ=";

     

       73
       74
        
         };

     

       74
       75
        
       

     

       76
       76
       +
         patches = [

     

       77
       77
       +
           (replaceVars ./fix-ldb-modules-path.patch {

     

       78
       78
       +
             inherit ldb;

     

       79
       79
       +
             out = null; # will be replaced in postPatch https://github.com/NixOS/nixpkgs/pull/446589#discussion_r2384899857

     

       80
       80
       +
           })

     

       81
       81
       +
         ];

     

       82
       82
       +
       

     

       75
       83
        
         postPatch = ''

     

       76
       84
        
           patchShebangs ./sbus_generate.sh.in

     

       85
       85
       +
       

     

       86
       86
       +
           substituteInPlace src/confdb/confdb.c \

     

       87
       87
       +
             --replace-fail "@out@" "${placeholder "out"}"

     

       77
       88
        
         '';

     

       78
       89
        
       

     

       79
       90
        
         # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>

     
···

       101
       112
        
             --with-xml-catalog-path=''${SGML_CATALOG_FILES%%:*}

     

       102
       113
        
             --with-ldb-lib-dir=$out/modules/ldb

     

       103
       114
        
             --with-nscd=${glibc.bin}/sbin/nscd

     

       115
       115
       +
             --with-sssd-user=root

     

       104
       116
        
           )

     

       105
       117
        
         ''

     

       106
       118
        
         + lib.optionalString withSudo ''

+13

pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch

···

       1
       1
       +
       diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c

     

       2
       2
       +
       index 8c19142..7865684 100644

     

       3
       3
       +
       --- a/src/confdb/confdb.c

     

       4
       4
       +
       +++ b/src/confdb/confdb.c

     

       5
       5
       +
       @@ -775,6 +775,8 @@ int confdb_init(TALLOC_CTX *mem_ctx,

     

       6
       6
       +
            int ret = EOK;

     

       7
       7
       +
            mode_t old_umask;

     

       8
       8
       +
        

     

       9
       9
       +
       +    setenv("LDB_MODULES_PATH", "@out@/modules/ldb:@ldb@/modules/ldb", 1);

     

       10
       10
       +
       +

     

       11
       11
       +
            if (cdb_ctx == NULL) {

     

       12
       12
       +
                DEBUG(SSSDBG_FATAL_FAILURE, "Bad argument\n");

     

       13
       13
       +
                return EFAULT;