diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/tests/ldap.scm | |
parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/tests/ldap.scm')
-rw-r--r-- | gnu/tests/ldap.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/tests/ldap.scm b/gnu/tests/ldap.scm index 2d4f15fb3c..197c1bfb28 100644 --- a/gnu/tests/ldap.scm +++ b/gnu/tests/ldap.scm @@ -84,7 +84,7 @@ config_version = 2 \n[slapd] -root_password = SECRET +root_password = SECRET_PASS user = root group = root @@ -112,7 +112,7 @@ suffix = dc=example,dc=com"))) (marionette-eval '(zero? (system* #$(file-append openldap "/bin/ldapwhoami") "-H" "ldap://localhost" "-D" - "cn=Directory Manager" "-w" "SECRET")) + "cn=Directory Manager" "-w" "SECRET_PASS")) marionette)) ;; Wait for nslcd to be up and running. |