Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
orbea -
OpenLDAP
Commits
ce2c5173
Commit
ce2c5173
authored
Feb 15, 2021
by
Quanah Gibson-Mount
Browse files
ITS#9161 - Fix various typos
Fix a number of different typos across the code base
parent
71213e69
Changes
68
Hide whitespace changes
Inline
Side-by-side
build/shtool
View file @
ce2c5173
...
...
@@ -317,7 +317,7 @@ eval `echo h.$opt_spec |\
eval
`
echo
h:help,
$opt_alias
|
\
sed
-e
's/-/_/g'
-e
's/\([a-zA-Z0-9]\):\([^,]*\),*/opt_ALIAS_\2=\1;/g'
`
# i
n
terate over argument line
# iterate over argument line
opt_PREV
=
''
while
[
$#
-gt
0
]
;
do
# special option stops processing
...
...
@@ -383,11 +383,11 @@ while [ $# -gt 0 ]; do
eval
"opt_
${
opt_OPT
}
=yes"
;;
':'
)
# option with argument (multiple occur
a
nces override)
# option with argument (multiple occur
re
nces override)
eval
"opt_
${
opt_OPT
}
=
\"\$
opt_ARG
\"
"
;;
'+'
)
# option with argument (multiple occur
a
nces append)
# option with argument (multiple occur
re
nces append)
eval
"opt_
${
opt_OPT
}
=
\"\$
opt_
${
opt_OPT
}
\$
{ASC_NL}
\$
opt_ARG
\"
"
;;
*
)
...
...
clients/tools/ldapdelete.c
View file @
ce2c5173
...
...
@@ -68,7 +68,7 @@ usage( void )
{
fprintf
(
stderr
,
_
(
"Delete entries from an LDAP server
\n\n
"
));
fprintf
(
stderr
,
_
(
"usage: %s [options] [dn]...
\n
"
),
prog
);
fprintf
(
stderr
,
_
(
" dn: list of DNs to delete. If not given, it will be read
ed
from stdin
\n
"
));
fprintf
(
stderr
,
_
(
" dn: list of DNs to delete. If not given, it will be read from stdin
\n
"
));
fprintf
(
stderr
,
_
(
" or from the file specified with
\"
-f file
\"
.
\n
"
));
fprintf
(
stderr
,
_
(
"Delete Options:
\n
"
));
fprintf
(
stderr
,
_
(
" -c continuous operation mode (do not stop on errors)
\n
"
));
...
...
clients/tools/ldapsearch.c
View file @
ce2c5173
...
...
@@ -132,7 +132,7 @@ usage( void )
fprintf
(
stderr
,
_
(
" !dontUseCopy (Don't Use Copy)
\n
"
));
fprintf
(
stderr
,
_
(
" [!]mv=<filter> (RFC 3876 matched values filter)
\n
"
));
fprintf
(
stderr
,
_
(
" [!]pr=<size>[/prompt|noprompt] (RFC 2696 paged results/prompt)
\n
"
));
fprintf
(
stderr
,
_
(
" [!]ps=<changetypes>/<changesonly>/<echg> (draft persisten search)
\n
"
));
fprintf
(
stderr
,
_
(
" [!]ps=<changetypes>/<changesonly>/<echg> (draft persisten
t
search)
\n
"
));
fprintf
(
stderr
,
_
(
" [!]sss=[-]<attr[:OID]>[/[-]<attr[:OID]>...]
\n
"
));
fprintf
(
stderr
,
_
(
" (RFC 2891 server side sorting)
\n
"
));
fprintf
(
stderr
,
_
(
" [!]subentries[=true|false] (RFC 3672 subentries)
\n
"
));
...
...
contrib/ldapc++/TODO
View file @
ce2c5173
...
...
@@ -20,7 +20,7 @@ Please read:
- Add SASL Authentication
- Add methods to the Data Classes (LDAPAttribute, LDAPEntry) for higher
usability. (e.g. LDAPAttributeList::getAttribute(name), ... )
- implement some Controls/Exten
t
ed Operations
- implement some Controls/Exten
d
ed Operations
- LDIF im/export library
- Rework the logging and debugging facilities
- write some more documentation about the design and structure of the
...
...
contrib/ldapc++/src/LDAPAsynConnection.h
View file @
ce2c5173
...
...
@@ -108,7 +108,7 @@ class LDAPAsynConnection{
*
* @throws LDAPException If the Request could not be sent to the
* destination server, a LDAPException-object contains the
* error that occured.
* error that occur
r
ed.
* This method does a simple (username, password) bind to the server.
* Other, saver, authentcation methods are provided later
* @param dn the distinguished name to bind as
...
...
@@ -132,7 +132,7 @@ class LDAPAsynConnection{
* Use the search method to perform a search on the LDAP-Directory
* @throws LDAPException If the Request could not be sent to the
* destination server, a LDAPException-object contains the
* error that occured.
* error that occur
r
ed.
* @param base The distinguished name of the starting point for the
* search operation
* @param scope The scope of the search. Possible values: <BR>
...
...
@@ -157,7 +157,7 @@ class LDAPAsynConnection{
* This method sends a delete request to the server
* @throws LDAPException If the Request could not be sent to the
* destination server, a LDAPException-object contains the
* error that occured.
* error that occur
r
ed.
* @param dn Distinguished name of the entry that should be deleted
* @param cons A set of constraints that should be used with this
* request
...
...
@@ -169,7 +169,7 @@ class LDAPAsynConnection{
*
* @throws LDAPException If the Request could not be sent to the
* destination server, a LDAPException-object contains the
* error that occured.
* error that occur
r
ed.
* @param dn Distinguished name of the entry for which the compare
* should be performed
* @param attr An Attribute (one (!) value) to use for the
...
...
@@ -185,7 +185,7 @@ class LDAPAsynConnection{
*
* @throws LDAPException If the Request could not be sent to the
* destination server, a LDAPException-object contains the
* error that occured.
* error that occur
r
ed.
* @param le The entry that will be added to the directory
*/
LDAPMessageQueue
*
add
(
const
LDAPEntry
*
le
,
...
...
@@ -195,7 +195,7 @@ class LDAPAsynConnection{
*
* @throws LDAPException If the Request could not be sent to the
* destination server, a LDAPException-object contains the
* error that occured.
* error that occur
r
ed.
* @param dn Distinguished Name of the Entry to modify
* @param modlist A set of modification that should be applied
* to the Entry
...
...
@@ -210,7 +210,7 @@ class LDAPAsynConnection{
*
* @throws LDAPException If the Request could not be sent to the
* destination server, a LDAPException-object contains the
* error that occured.
* error that occur
r
ed.
* @param dn DN to modify
* @param newRDN The new relative DN for the entry
* @param delOldRDN true=The old RDN will be removed from the
...
...
@@ -229,7 +229,7 @@ class LDAPAsynConnection{
*
* @throws LDAPException If the Request could not be sent to the
* destination server, a LDAPException-object contains the
* error that occured.
* error that occur
r
ed.
* @param oid The dotted decimal representation of the extended
* Operation that should be performed
* @param value The data associated with this operation
...
...
contrib/ldapc++/src/LDAPConnection.h
View file @
ce2c5173
...
...
@@ -14,7 +14,7 @@
/** Main class for synchronous LDAP-Communication
*
* The class represent a LDAP-Connection to perform synchronous
* LDAP-Operations. This provides method
e
s for the different
* LDAP-Operations. This provides methods for the different
* LDAP-Operations. All the methods for the LDAP-operations block until
* all results for the operation are received or until an error occurs
*/
...
...
contrib/ldapc++/src/LDAPConstraints.h
View file @
ce2c5173
...
...
@@ -18,7 +18,7 @@
// * the Restart-Option ???
// * default Server(s)
//* Class for represent
at
ing the various protocol options
//* Class for representing the various protocol options
/** This class represents some options that can be set for a LDAPConnection
* operation. Namely these are time and size limits. Options for referral
* chasing and a default set of client of server controls to be used with
...
...
contrib/ldapc++/src/LDAPRequest.h
View file @
ce2c5173
...
...
@@ -61,7 +61,7 @@ class LDAPRequest{
void
unbind
()
const
;
/**
* This method encodes the request an calls the apprpriate
* This method encodes the request an calls the appr
o
priate
* functions of the C-API to send the Request to a LDAP-Server
*/
virtual
LDAPMessageQueue
*
sendRequest
()
=
0
;
...
...
contrib/ldaptcl/README
View file @
ce2c5173
...
...
@@ -48,7 +48,7 @@ Shared libraries and Tcl packages.
If Tcl is built with --enable-shared, AND OpenLDAP (or another version
for that matter) has been build to create -llber and -lldap as shared
libaries, AND you build ldaptcl with --enable-shared, it should be
lib
r
aries, AND you build ldaptcl with --enable-shared, it should be
possible to run a plain Tcl interpreter (eg. tclsh8.0) and do
package require Ldaptcl
...
...
contrib/ldaptcl/neoXldap.c
View file @
ce2c5173
...
...
@@ -178,7 +178,7 @@ LDAP_ErrorStringToCode(Tcl_Interp *interp, char *s)
* o evalCodeObj - Tcl_Obj pointer to code to eval against this result.
* Returns:
* o TCL_OK if processing succeeded..
* o TCL_ERROR if an error occured, with error message in interp.
* o TCL_ERROR if an error occur
r
ed, with error message in interp.
*-----------------------------------------------------------------------------
*/
int
...
...
@@ -282,7 +282,7 @@ LDAP_ProcessOneSearchResult (interp, ldap, entry, destArrayNameObj, evalCodeObj)
* o evalCodeObj - Tcl_Obj pointer to code to eval against this result.
* Returns:
* o TCL_OK if processing succeeded..
* o TCL_ERROR if an error occured, with error message in interp.
* o TCL_ERROR if an error occur
r
ed, with error message in interp.
*-----------------------------------------------------------------------------
*/
int
...
...
contrib/slapd-modules/autogroup/autogroup.c
View file @
ce2c5173
...
...
@@ -849,7 +849,7 @@ done:
/*
** When adding a group, we first strip any existing members,
** and add all which match the filters oursel
f
s.
** and add all which match the filters oursel
ve
s.
*/
static
int
autogroup_add_entry
(
Operation
*
op
,
SlapReply
*
rs
)
...
...
@@ -1385,7 +1385,7 @@ autogroup_response( Operation *op, SlapReply *rs )
/* When modifying any of the attributes of an entry, we must
check if the entry is in any of our groups, and if
the modified entry maches any of the filters of that group.
the modified entry ma
t
ches any of the filters of that group.
If the entry exists in a group, but the modified attributes do
not match any of the group's filters, we delete the entry from that group.
...
...
contrib/slapd-modules/comp_match/asn_to_syn_mr.c
View file @
ce2c5173
...
...
@@ -123,7 +123,7 @@ AsnTypetoCompMatchingRule asntype_to_compMR_mapping_tbl[] = {
};
/*
* This table map
p
s an ASN type to a corresponding ComponentType which has
* This table maps an ASN type to a corresponding ComponentType which has
* equivalent contents of an existing AttributeType
*/
AsnTypetoCompType
asntype_to_compType_mapping_tbl
[]
=
{
...
...
contrib/slapd-modules/comp_match/componentlib.h
View file @
ce2c5173
...
...
@@ -558,7 +558,7 @@ retrieve_matching_rule( char* mr_oid, AsnTypeId type );
#define INITIAL_ATTR_SIZE 256
#define INCREMENT_SIZE 32
/*
*
F
ollowing
s
are for conversion from ASN.1 RDN and DN to
*
The f
ollowing are for conversion from ASN.1 RDN and DN to
* LDAP encodings
*/
#define MAX_ALIASING_ENTRY 128
...
...
contrib/slapd-modules/comp_match/init.c
View file @
ce2c5173
...
...
@@ -687,7 +687,7 @@ comp_test_components( void* attr_nm, void* assert_nm, ComponentSyntaxInfo* csi_a
rc
=
comp_test_components
(
attr_nm
,
assert_nm
,
contained_comp
,
ca
);
}
else
{
/* Ivalid Component reference */
/* I
n
valid Component reference */
rc
=
LDAP_PROTOCOL_ERROR
;
}
break
;
...
...
contrib/slapd-modules/kinit/README
View file @
ce2c5173
...
...
@@ -17,7 +17,7 @@ default to).
Use Makefile or the following commands should work to
build it from inside the unpacked slapd sources, provided the required KRB5
header files and libaries are installed on your system:
header files and lib
r
aries are installed on your system:
gcc -fPIC -c -I ../../../include/ -I ../../../servers/slapd kinit.c
gcc -shared -o kinit.so kinit.o -lkrb5
...
...
contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd-prot.h
View file @
ce2c5173
...
...
@@ -228,10 +228,10 @@ static void debug_dump(const void *ptr, size_t size)
#define BUF_SKIP(sz) \
bufptr += (size_t)(sz);
/* move BUF_CUR for
e
ward so that it is aligned to the specified
/* move BUF_CUR forward so that it is aligned to the specified
type width */
#define BUF_ALIGN(fp, type) \
/* figure out number of bytes to skip for
e
ward */
\
/* figure out number of bytes to skip forward */
\
tmp2int32 = (sizeof(type) - ((BUF_CUR - (char *)NULL) % sizeof(type))) \
% sizeof(type); \
/* check and skip */
\
...
...
@@ -279,7 +279,7 @@ static void debug_dump(const void *ptr, size_t size)
(field) = BUF_CUR; \
BUF_SKIP(tmpint32 + 1);
/* read an array from a stram and store it as a null-terminated
/* read an array from a str
e
am and store it as a null-terminated
array list (size for the array is allocated) */
#define READ_BUF_STRINGLIST(fp, arr) \
/* read the number of entries */
\
...
...
@@ -299,7 +299,7 @@ static void debug_dump(const void *ptr, size_t size)
/* SKIP macros for skipping over certain parts of the protocol stream. */
/* skip a number of bytes for
e
ward */
/* skip a number of bytes forward */
#define SKIP(fp, sz) \
DEBUG_PRINT("READ : skip %d bytes", (int)(sz)); \
/* read (skip) the specified number of bytes */
\
...
...
contrib/slapd-modules/nssov/nssov.c
View file @
ce2c5173
...
...
@@ -158,7 +158,7 @@ int write_address(TFILE *fp,struct berval *addr)
/* failure, log but write simple invalid address
(otherwise the address list is messed up) */
/* TODO: have error message in correct format */
Debug
(
LDAP_DEBUG_ANY
,
"nssov: unpars
e
able address: %s
\n
"
,
addr
->
bv_val
);
Debug
(
LDAP_DEBUG_ANY
,
"nssov: unparsable address: %s
\n
"
,
addr
->
bv_val
);
/* write an illegal address type */
WRITE_INT32
(
fp
,
-
1
);
/* write an empty address */
...
...
contrib/slapd-modules/nssov/shadow.c
View file @
ce2c5173
...
...
@@ -83,7 +83,7 @@ static long to_date(struct berval *date,AttributeDescription *attr)
/* we expect an AD 64-bit datetime value;
we should do date=date/864000000000-134774
but that causes problems on 32-bit platforms,
first we d
e
vide by 1000000000 by stripping the
first we d
i
vide by 1000000000 by stripping the
last 9 digits from the string and going from there */
l
=
date
->
bv_len
-
9
;
if
(
l
<
1
||
l
>
(
sizeof
(
buffer
)
-
1
))
...
...
contrib/slapd-modules/nssov/slapo-nssov.5
View file @
ce2c5173
...
...
@@ -242,7 +242,7 @@ Specify a PAM service name whose sessions will be recorded. For the
configured services, logins will be recorded in the
.TP
.B nssov-pam-password-prohibit-message <message>
Diable password change service and return the specified message to
Di
s
able password change service and return the specified message to
users.
.TP
.B nssov-pam-pwdmgr-dn <dn>
...
...
contrib/slapd-modules/passwd/pbkdf2/README
View file @
ce2c5173
...
...
@@ -24,7 +24,7 @@ First, You need to configure and build OpenLDAP.
$ make
# make install
# Configration
# Config
u
ration
In slapd.conf:
...
...
Prev
1
2
3
4
Next
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