diff options
| -rw-r--r-- | nixos/modules/services/databases/openldap.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 608e88938b431..5006a3065e940 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -319,7 +319,7 @@ in { # outside the main process: # Got notification message from PID 6378, but reception only permitted for main PID 6377 NotifyAccess = "all"; - RuntimeDirectory = "slapd"; # TODO: openldap, for consistency + RuntimeDirectory = "openldap"; StateDirectory = ["openldap"] ++ (map ({olcDbDirectory, ... }: removePrefix "/var/lib/" olcDbDirectory) (attrValues dbSettings)); StateDirectoryMode = "700"; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 4198221e79832..80c226a1058fc 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { "ac_cv_func_memcmp_working=yes" ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; - NIX_CFLAGS_COMPILE = [ "-DLDAPI_SOCK=\"/run/slapd/ldapi\"" ]; + NIX_CFLAGS_COMPILE = [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ]; makeFlags= [ "CC=${stdenv.cc.targetPrefix}cc" |