Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 4814a585deae
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 23bdc67f8bf8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 12, 2020

  1. nixos/openldap: check configuration with slaptest 

    slapd does only print the error and not the line number.
Sometimes it is not even clear that it fails to start
due to an incorrect configuration file.

Example output of slaptest:

5e1b2179 /nix/store/gbn2v319d4qgw851sg41mcmjm5dpn39i-slapd.conf: line 134 objectClass: Missing closing parenthesis before end of input
ObjectClassDescription = "(" whsp
  numericoid whsp                 ; ObjectClass identifier
  [ "NAME" qdescrs ]
  [ "DESC" qdstring ]
  [ "OBSOLETE" whsp ]
  [ "SUP" oids ]                ; Superior ObjectClasses
  [ ( "ABSTRACT" / "STRUCTURAL" / "AUXILIARY" ) whsp ]
                                  ; default structural
  [ "MUST" oids ]               ; AttributeTypes
  [ "MAY" oids ]                ; AttributeTypes
  whsp ")"
slaptest: bad configuration file!
    @Mic92
    Mic92 committed Jan 12, 2020
    Copy the full SHA
    382b0aa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #77561 from Mic92/openldap 

    nixos/openldap: check configuration with slaptest
    @fpletz
    fpletz committed Jan 12, 2020
    Copy the full SHA
    23bdc67 View commit details
    Browse the repository at this point in the history