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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Aurélien
backupninja
Commits
fe7ee521
Commit
fe7ee521
authored
Jun 10, 2006
by
micah
Browse files
Options
Downloads
Patches
Plain Diff
add in-line compression to ldap handler
parent
a2436c2b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+4
-2
4 additions, 2 deletions
ChangeLog
handlers/ldap
+15
-7
15 additions, 7 deletions
handlers/ldap
with
19 additions
and
9 deletions
ChangeLog
+
4
−
2
View file @
fe7ee521
...
...
@@ -15,13 +15,13 @@ version 0.9.4 -- unreleased
. Fixed erroneous removal of tmpfile when it didn't exit
. Fixed inversed vsname emptiness check
. Fixed su quote usage to be more posixy
.
c
ompress for sqldumps now happens in-line to save some disk space (Closes: #370778)
.
C
ompress for sqldumps now happens in-line to save some disk space (Closes: #370778)
pgsql:
. Fixed inversed vsname emptiness check
. Fixed su quote usage to be more posixy
. Fixed shell expansion, thanks Thomas Kotzian (Closes: #363297)
. postgres user UID is now the one from inside the vserver if necessary
.
c
ompress now happens in-line to save some disk space (Closes: #370778)
.
C
ompress now happens in-line to save some disk space (Closes: #370778)
svn:
. Fixed inversed vsname emptiness check
rdiff:
...
...
@@ -43,6 +43,8 @@ version 0.9.4 -- unreleased
. Now forbid to (try to) include /.
sys:
. Many more system checks were added, thanks to Petr Klíma
ldap:
. Compress now happens in-line to save some disk space (Closes: #370778)
lib changes
vserver:
. init_vservers: fixed Debian bug #351083 (improper readlink syntax)
...
...
This diff is collapsed.
Click to expand it.
handlers/ldap
+
15
−
7
View file @
fe7ee521
...
...
@@ -46,10 +46,18 @@ if [ "$ldif" == "yes" ]; then
fi
if
[
"
$method
"
==
"slapcat"
]
;
then
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$SLAPCAT
-f
$conf
-b
$dbsuffix
|
$GZIP
"
else
execstr
=
"
$SLAPCAT
-f
$conf
-b
$dbsuffix
"
fi
debug
"
$execstr
"
else
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$LDAPSEARCH
-x -L -b ""
$dbsuffix
"" -D ""
$binddn
"" -y
$passwordfile
|
$GZIP
"
else
execstr
=
"
$LDAPSEARCH
-x -L -b ""
$dbsuffix
"" -D ""
$binddn
"" -y
$passwordfile
"
fi
[
-f
"
$passwordfile
"
]
||
fatal
"Password file
$passwordfile
not found. When method is set to ldapsearch, you must also specify a password file."
debug
"
$execstr
"
fi
...
...
@@ -64,7 +72,11 @@ if [ "$ldif" == "yes" ]; then
fatal
"Couldn't create ldif dump file:
$dumpdir
/
$dbsuffix
.ldif"
fi
if
[
"
$compress
"
==
"yes"
]
;
then
output
=
`
$execstr
>
$dumpdir
/
$dbsuffix
.ldif.gz
`
else
output
=
`
$execstr
>
$dumpdir
/
$dbsuffix
.ldif
`
fi
code
=
$?
if
[
"
$code
"
==
"0"
]
;
then
debug
$output
...
...
@@ -73,10 +85,6 @@ if [ "$ldif" == "yes" ]; then
warning
$output
warning
"Failed ldif export of
$dbsuffix
"
fi
if
[
"
$compress
"
==
"yes"
]
;
then
output
=
`
$GZIP
-f
"
$dumpdir
/
$dbsuffix
.ldif"
2>&1
`
debug
$output
fi
if
[
"
$restart
"
==
"yes"
]
;
then
debug
"Starting ldap server..."
...
...
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