Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Isaac Boukris
OpenLDAP
Commits
d78c963e
Commit
d78c963e
authored
Jul 09, 2008
by
Quanah Gibson-Mount
Browse files
be more liberal when parsing LDIF Entries
parent
be5f314f
Changes
2
Hide whitespace changes
Inline
Side-by-side
contrib/ldapc++/src/LdifReader.cpp
View file @
d78c963e
// $OpenLDAP$
/*
* Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
...
...
@@ -195,14 +196,14 @@ LDAPEntry LdifReader::getEntryRecord()
}
else
{
if
(
curAl
->
getAttributeByName
(
i
->
first
)
)
const
LDAPAttribute
*
existing
=
curAl
->
getAttributeByName
(
i
->
first
);
if
(
existing
)
{
// Attribute exists already -> Syntax Error
std
::
ostringstream
err
;
err
<<
"Line "
<<
this
->
m_lineNumber
<<
": Attribute
\"
"
<<
i
->
first
<<
"
\"
specified multiple times."
;
throw
(
std
::
runtime_error
(
err
.
str
())
);
// Attribute exists already (handle gracefully)
curAl
->
addAttribute
(
curAttr
);
curAttr
=
LDAPAttribute
(
*
existing
);
curAttr
.
addValue
(
i
->
second
);
curAl
->
delAttribute
(
i
->
first
);
}
else
{
...
...
contrib/ldapc++/src/Makefile.in
View file @
d78c963e
# Makefile.in generated by automake 1.10 from Makefile.am.
# Makefile.in generated by automake 1.10
.1
from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006
, 2007, 2008
Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
...
...
@@ -116,6 +116,7 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W
=
@CYGPATH_W@
DEFS
=
@DEFS@
DEPDIR
=
@DEPDIR@
DSYMUTIL
=
@DSYMUTIL@
ECHO
=
@ECHO@
ECHO_C
=
@ECHO_C@
ECHO_N
=
@ECHO_N@
...
...
@@ -138,6 +139,7 @@ LN_S = @LN_S@
LTLIBOBJS
=
@LTLIBOBJS@
MAKEINFO
=
@MAKEINFO@
MKDIR_P
=
@MKDIR_P@
NMEDIT
=
@NMEDIT@
OBJEXT
=
@OBJEXT@
PACKAGE
=
@PACKAGE@
PACKAGE_BUGREPORT
=
@PACKAGE_BUGREPORT@
...
...
@@ -350,8 +352,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@
list
=
'
$(lib_LTLIBRARIES)
'
;
for
p
in
$$
list
;
do
\
if
test
-f
$$
p
;
then
\
f
=
$(am__strip_dir)
\
echo
"
$(LIBTOOL)
--mode=install
$(libLTLIBRARIES_INSTALL)
$(INSTALL_STRIP_FLAG)
'
$$
p' '
$(DESTDIR)$(libdir)
/
$$
f'"
;
\
$(LIBTOOL)
--mode
=
install
$(libLTLIBRARIES_INSTALL)
$(INSTALL_STRIP_FLAG)
"
$$
p"
"
$(DESTDIR)$(libdir)
/
$$
f"
;
\
echo
"
$(LIBTOOL)
$(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS)
--mode=install
$(libLTLIBRARIES_INSTALL)
$(INSTALL_STRIP_FLAG)
'
$$
p' '
$(DESTDIR)$(libdir)
/
$$
f'"
;
\
$(LIBTOOL)
$(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS)
--mode
=
install
$(libLTLIBRARIES_INSTALL)
$(INSTALL_STRIP_FLAG)
"
$$
p"
"
$(DESTDIR)$(libdir)
/
$$
f"
;
\
else
:
;
fi
;
\
done
...
...
@@ -359,8 +361,8 @@ uninstall-libLTLIBRARIES:
@
$(NORMAL_UNINSTALL)
@
list
=
'
$(lib_LTLIBRARIES)
'
;
for
p
in
$$
list
;
do
\
p
=
$(am__strip_dir)
\
echo
"
$(LIBTOOL)
--mode=uninstall rm -f '
$(DESTDIR)$(libdir)
/
$$
p'"
;
\
$(LIBTOOL)
--mode
=
uninstall
rm
-f
"
$(DESTDIR)$(libdir)
/
$$
p"
;
\
echo
"
$(LIBTOOL)
$(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS)
--mode=uninstall rm -f '
$(DESTDIR)$(libdir)
/
$$
p'"
;
\
$(LIBTOOL)
$(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS)
--mode
=
uninstall
rm
-f
"
$(DESTDIR)$(libdir)
/
$$
p"
;
\
done
clean-libLTLIBRARIES
:
...
...
@@ -472,8 +474,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique
=
`
for
i
in
$$
list
;
do
\
if
test
-f
"
$$
i"
;
then
echo
$$
i
;
else
echo
$(srcdir)
/
$$
i
;
fi
;
\
done
|
\
$(AWK)
'
{ files[$$0] = 1; } \
END { for (i in files) print i; }'
`
;
\
$(AWK)
'{ files[$$0] = 1;
nonemtpy = 1;
} \
END {
if (nonempty) {
for (i in files) print i;
};
}'
`
;
\
mkid
-fID
$$
unique
tags
:
TAGS
...
...
@@ -485,8 +487,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
unique
=
`
for
i
in
$$
list
;
do
\
if
test
-f
"
$$
i"
;
then
echo
$$
i
;
else
echo
$(srcdir)
/
$$
i
;
fi
;
\
done
|
\
$(AWK)
'
{ files[$$0] = 1; } \
END { for (i in files) print i; }'
`
;
\
$(AWK)
'{ files[$$0] = 1;
nonempty = 1;
} \
END {
if (nonempty) {
for (i in files) print i;
};
}'
`
;
\
if
test
-z
"
$(ETAGS_ARGS)$$
tags
$$
unique"
;
then
:
;
else
\
test
-n
"
$$
unique"
||
unique
=
$$
empty_fix
;
\
$(ETAGS)
$(ETAGSFLAGS)
$(AM_ETAGSFLAGS)
$(ETAGS_ARGS)
\
...
...
@@ -496,13 +498,12 @@ ctags: CTAGS
CTAGS
:
$(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES)
\
$(TAGS_FILES) $(LISP)
tags
=
;
\
here
=
`
pwd
`
;
\
list
=
'
$(SOURCES)
$(HEADERS)
config.h.in
$(LISP)
$(TAGS_FILES)
'
;
\
unique
=
`
for
i
in
$$
list
;
do
\
if
test
-f
"
$$
i"
;
then
echo
$$
i
;
else
echo
$(srcdir)
/
$$
i
;
fi
;
\
done
|
\
$(AWK)
'
{ files[$$0] = 1; } \
END { for (i in files) print i; }'
`
;
\
$(AWK)
'{ files[$$0] = 1;
nonempty = 1;
} \
END {
if (nonempty) {
for (i in files) print i;
};
}'
`
;
\
test
-z
"
$(CTAGS_ARGS)$$
tags
$$
unique"
\
||
$(CTAGS)
$(CTAGSFLAGS)
$(AM_CTAGSFLAGS)
$(CTAGS_ARGS)
\
$$
tags
$$
unique
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment