Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
backupninja
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lyz
backupninja
Commits
a4422997
Commit
a4422997
authored
17 years ago
by
micah
Browse files
Options
Downloads
Patches
Plain Diff
fixed Trac#29 causing slapcat + gzip not to work
parent
c2f0b78a
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+4
-2
4 additions, 2 deletions
ChangeLog
handlers/ldap.in
+4
-3
4 additions, 3 deletions
handlers/ldap.in
with
8 additions
and
5 deletions
ChangeLog
+
4
−
2
View file @
a4422997
...
...
@@ -11,8 +11,8 @@ version 0.9.5 -- unreleased
created with permissions 000 by an older ninjahelper version.
. Enhanced portability for other platforms
. Added quoting because it was needed to prevent shell expansion, broking the
toint function sometimes (Trac#11)
. Fixed reportspace option (Trac#10)
toint function sometimes (
Closes:
Trac#11)
. Fixed reportspace option (
Closes:
Trac#10)
handler changes
dup:
. Support duplicity >= 0.4.3 invocation syntax (--ssh-command option
...
...
@@ -23,6 +23,8 @@ version 0.9.5 -- unreleased
file (Closes: #394935)
. Fixed ninjahelper to properly set compress option, standardized on yes/no
instead of on/off
. Fixed problem that caused combination of slapcat and compress to not work
together (Closes: Trac#29)
maildir:
. Added an examples file (Closes: Trac#23)
mysql:
...
...
This diff is collapsed.
Click to expand it.
handlers/ldap.in
+
4
−
3
View file @
a4422997
...
...
@@ -55,7 +55,6 @@ if [ "$ldif" == "yes" ]; then
if
[
"
$method
"
==
"slapcat"
]
;
then
execstr
=
"
$SLAPCAT
-f
$conf
-b
$dbsuffix
"
debug
"
$execstr
"
else
if
[
-n
"
$ldaphost
"
]
;
then
execstr
=
"
$LDAPSEARCH
-H
$URLBASE
://
$ldaphost
-x -L -b ""
$dbsuffix
"" -D ""
$binddn
"" -y
$passwordfile
"
...
...
@@ -81,10 +80,12 @@ if [ "$ldif" == "yes" ]; then
fi
if
[
"
$compress
"
==
"yes"
]
;
then
output
=
`
$execstr
|
$GZIP
>
$dumpdir
/
$dbsuffix
.ldif.gz
`
execstr
=
"
$execstr
|
$GZIP
>
$dumpdir
/
$dbsuffix
.ldif.gz
"
else
output
=
`
$execstr
>
$dumpdir
/
$dbsuffix
.ldif
`
execstr
=
"
$execstr
>
$dumpdir
/
$dbsuffix
.ldif
"
fi
debug
"
$execstr
"
output
=
`
su root
-c
"
$execstr
"
2>&1
`
code
=
$?
if
[
"
$code
"
==
"0"
]
;
then
debug
$output
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment