From 21c70857f1029309d6bc5a5b6a93d7537494b742 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 3 Jun 1999 00:37:44 +0000 Subject: [PATCH] s/// --- clients/fax500/main.c | 3 ++- clients/fax500/rp500.c | 3 ++- clients/finger/main.c | 3 ++- clients/gopher/go500.c | 3 ++- clients/gopher/go500gw.c | 3 ++- clients/mail500/main.c | 3 ++- clients/rcpt500/cmds.c | 2 +- clients/rcpt500/main.c | 3 ++- clients/rcpt500/query.c | 3 ++- clients/tools/ldapdelete.c | 5 +++-- clients/tools/ldapmodify.c | 3 ++- clients/tools/ldapmodrdn.c | 3 ++- clients/tools/ldappasswd.c | 3 ++- clients/tools/ldapsearch.c | 3 ++- clients/ud/auth.c | 3 ++- clients/ud/edit.c | 3 ++- clients/ud/find.c | 3 ++- clients/ud/main.c | 4 +++- clients/ud/mod.c | 3 ++- clients/ud/util.c | 3 ++- contrib/saucer/main.c | 3 ++- contrib/web_ldap/util.c | 7 +++---- contrib/web_ldap/web_ldap.c | 6 +++--- libraries/libavl/avl.c | 2 +- libraries/libavl/testavl.c | 2 +- libraries/liblber/decode.c | 4 ++-- libraries/liblber/dtest.c | 2 +- libraries/liblber/encode.c | 3 ++- libraries/liblber/etest.c | 3 ++- libraries/liblber/idtest.c | 3 ++- libraries/liblber/io.c | 3 ++- libraries/liblber/memory.c | 2 +- libraries/liblber/options.c | 2 +- libraries/liblber/sockbuf.c | 3 ++- libraries/libldap/abandon.c | 3 ++- libraries/libldap/addentry.c | 3 ++- libraries/libldap/apitest.c | 3 ++- libraries/libldap/bind.c | 3 ++- libraries/libldap/cache.c | 3 ++- libraries/libldap/charset.c | 5 +++-- libraries/libldap/cldap.c | 3 ++- libraries/libldap/controls.c | 2 +- libraries/libldap/disptmpl.c | 3 ++- libraries/libldap/dsparse.c | 2 +- libraries/libldap/error.c | 3 ++- libraries/libldap/extended.c | 2 +- libraries/libldap/free.c | 2 +- libraries/libldap/friendly.c | 2 +- libraries/libldap/getattr.c | 2 +- libraries/libldap/getdn.c | 3 ++- libraries/libldap/getdxbyname.c | 2 +- libraries/libldap/getentry.c | 2 +- libraries/libldap/getfilter.c | 3 ++- libraries/libldap/getvalues.c | 3 ++- libraries/libldap/init.c | 2 +- libraries/libldap/kbind.c | 2 +- libraries/libldap/messages.c | 3 ++- libraries/libldap/open.c | 3 ++- libraries/libldap/options.c | 3 ++- libraries/libldap/os-ip.c | 3 ++- libraries/libldap/references.c | 3 ++- libraries/libldap/request.c | 3 ++- libraries/libldap/result.c | 3 ++- libraries/libldap/schema.c | 2 +- libraries/libldap/search.c | 3 ++- libraries/libldap/sort.c | 2 +- libraries/libldap/srchpref.c | 3 ++- libraries/libldap/string.c | 2 +- libraries/libldap/test.c | 3 ++- libraries/libldap/tmplout.c | 3 ++- libraries/libldap/tmpltest.c | 3 ++- libraries/libldap/ufn.c | 7 ++++--- libraries/libldap/unbind.c | 2 +- libraries/libldap/url.c | 3 ++- libraries/libldap/util-int.c | 2 +- libraries/libldap_r/rdwr.c | 2 +- libraries/libldap_r/thr_sleep.c | 2 +- libraries/libldbm/ldbm.c | 7 ++++--- libraries/libldif/line64.c | 5 +++-- libraries/liblutil/base64.c | 6 ++---- libraries/liblutil/getpass.c | 3 ++- libraries/liblutil/passwd.c | 2 +- libraries/liblutil/setproctitle.c | 3 ++- libraries/liblutil/sha1.c | 2 +- libraries/liblutil/tempnam.c | 3 ++- servers/slapd/back-bdb2/alias.c | 4 ++-- servers/slapd/back-bdb2/txn.h | 2 +- servers/slapd/back-ldbm/alias.c | 4 ++-- servers/slapd/back-shell/abandon.c | 2 +- servers/slapd/ch_malloc.c | 3 ++- servers/slapd/proto-slap.h | 2 +- servers/slapd/shell-backends/passwd-shell.c | 3 ++- servers/slapd/shell-backends/shellutil.c | 2 +- servers/slapd/slap.h | 4 ++-- servers/slapd/suffixalias.c | 4 ++-- servers/slapd/tools/centipede.c | 2 +- servers/slapd/tools/chlog2replog.c | 4 ++-- servers/slapd/tools/edb2ldif.c | 3 ++- servers/slapd/tools/ldapsyntax.c | 2 +- servers/slapd/tools/ldbmtest.c | 2 +- servers/slapd/tools/ldif.c | 9 +++++---- servers/slapd/tools/ldif2id2children-bdb2.c | 3 ++- servers/slapd/tools/ldif2id2children.c | 3 ++- servers/slapd/tools/ldif2id2entry-bdb2.c | 3 ++- servers/slapd/tools/ldif2id2entry.c | 3 ++- servers/slapd/tools/ldif2index-bdb2.c | 3 ++- servers/slapd/tools/ldif2index.c | 3 ++- servers/slapd/tools/sizecount.c | 3 ++- servers/slapd/user.c | 3 ++- servers/slurpd/args.c | 2 +- servers/slurpd/ch_malloc.c | 2 +- servers/slurpd/config.c | 2 +- servers/slurpd/fm.c | 2 +- servers/slurpd/globals.c | 3 ++- servers/slurpd/ldap_op.c | 5 +++-- servers/slurpd/re.c | 2 +- servers/slurpd/ri.c | 3 ++- servers/slurpd/rq.c | 3 ++- servers/slurpd/st.c | 3 ++- tests/progs/slapd-addel.c | 3 ++- tests/progs/slapd-read.c | 3 ++- tests/progs/slapd-search.c | 3 ++- tests/progs/slapd-tester.c | 3 ++- 123 files changed, 223 insertions(+), 148 deletions(-) diff --git a/clients/fax500/main.c b/clients/fax500/main.c index 1c090da495..a4a6e30857 100644 --- a/clients/fax500/main.c +++ b/clients/fax500/main.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/fax500/rp500.c b/clients/fax500/rp500.c index d3373d3d4d..f4f9c58425 100644 --- a/clients/fax500/rp500.c +++ b/clients/fax500/rp500.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/finger/main.c b/clients/finger/main.c index defb810157..1dc1664d80 100644 --- a/clients/finger/main.c +++ b/clients/finger/main.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c index 706da3c40e..7b5141bbed 100644 --- a/clients/gopher/go500.c +++ b/clients/gopher/go500.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c index 058ada1fcc..9381acda5b 100644 --- a/clients/gopher/go500gw.c +++ b/clients/gopher/go500gw.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/mail500/main.c b/clients/mail500/main.c index dfc868ddb7..dec8e66d3e 100644 --- a/clients/mail500/main.c +++ b/clients/mail500/main.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/rcpt500/cmds.c b/clients/rcpt500/cmds.c index 8b5a938f2e..ef7a73bf3b 100644 --- a/clients/rcpt500/cmds.c +++ b/clients/rcpt500/cmds.c @@ -8,7 +8,7 @@ #include "portable.h" -#include +#include #include "rcpt500.h" struct command cmds[] = { diff --git a/clients/rcpt500/main.c b/clients/rcpt500/main.c index fc12b247e9..4cfcd66a79 100644 --- a/clients/rcpt500/main.c +++ b/clients/rcpt500/main.c @@ -9,7 +9,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/rcpt500/query.c b/clients/rcpt500/query.c index 51fdf8312e..c035881849 100644 --- a/clients/rcpt500/query.c +++ b/clients/rcpt500/query.c @@ -9,7 +9,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index 0bcda8a1ae..7290fc3368 100644 --- a/clients/tools/ldapdelete.c +++ b/clients/tools/ldapdelete.c @@ -3,8 +3,9 @@ #include "portable.h" #include -#include -#include + +#include +#include #include #include diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index 720fb40981..e9e37cb8bc 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -7,7 +7,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index 98c91f3f5e..6e98c7d32f 100644 --- a/clients/tools/ldapmodrdn.c +++ b/clients/tools/ldapmodrdn.c @@ -15,7 +15,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c index cf3aee05c0..83507119df 100644 --- a/clients/tools/ldappasswd.c +++ b/clients/tools/ldappasswd.c @@ -16,7 +16,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index 49c02495ba..2494e652dd 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/ud/auth.c b/clients/ud/auth.c index ec1af8d5fb..4174a396a1 100644 --- a/clients/ud/auth.c +++ b/clients/ud/auth.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/ud/edit.c b/clients/ud/edit.c index 458a38098a..6ff9a1677d 100644 --- a/clients/ud/edit.c +++ b/clients/ud/edit.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/ud/find.c b/clients/ud/find.c index 8a5e0dddd6..437c78fbff 100644 --- a/clients/ud/find.c +++ b/clients/ud/find.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/ud/main.c b/clients/ud/main.c index 790aa483a5..bb0bb8ca7e 100644 --- a/clients/ud/main.c +++ b/clients/ud/main.c @@ -23,7 +23,9 @@ #include "portable.h" #include -#include + +#include + #include #ifdef HAVE_PWD_H diff --git a/clients/ud/mod.c b/clients/ud/mod.c index 82de3e2d57..312836cdca 100644 --- a/clients/ud/mod.c +++ b/clients/ud/mod.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/clients/ud/util.c b/clients/ud/util.c index e7ab7626bb..e2ab119150 100644 --- a/clients/ud/util.c +++ b/clients/ud/util.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/contrib/saucer/main.c b/contrib/saucer/main.c index 59ea5e4d85..605c1ad4ed 100644 --- a/contrib/saucer/main.c +++ b/contrib/saucer/main.c @@ -20,7 +20,8 @@ #include "portable.h" #include -#include + +#include #ifdef HAVE_READLINE # include diff --git a/contrib/web_ldap/util.c b/contrib/web_ldap/util.c index d52365cb9c..b6aa34a273 100644 --- a/contrib/web_ldap/util.c +++ b/contrib/web_ldap/util.c @@ -15,10 +15,9 @@ #include "portable.h" #include -#include -#ifdef HAVE_SYS_TIME_H -#include -#endif + +#include +#include #include #include diff --git a/contrib/web_ldap/web_ldap.c b/contrib/web_ldap/web_ldap.c index c37ef3846c..37376d1ec9 100644 --- a/contrib/web_ldap/web_ldap.c +++ b/contrib/web_ldap/web_ldap.c @@ -7,15 +7,15 @@ #include "portable.h" -#include #include #include #include #include -#include -#include +#include #include +#include +#include #include #include diff --git a/libraries/libavl/avl.c b/libraries/libavl/avl.c index adce228dd7..e4b2b1be44 100644 --- a/libraries/libavl/avl.c +++ b/libraries/libavl/avl.c @@ -19,7 +19,7 @@ static char avl_version[] = "AVL library version 1.0\n"; #endif #include -#include +#include #define AVL_INTERNAL #include "avl.h" diff --git a/libraries/libavl/testavl.c b/libraries/libavl/testavl.c index 3b927d9807..3328933eca 100644 --- a/libraries/libavl/testavl.c +++ b/libraries/libavl/testavl.c @@ -3,8 +3,8 @@ #include "portable.h" #include -#include +#include #include #define AVL_INTERNAL diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c index 69ce1eac1e..3db8181aed 100644 --- a/libraries/liblber/decode.c +++ b/libraries/liblber/decode.c @@ -18,10 +18,10 @@ #include "portable.h" #include -#include -#include +#include +#include #include #include diff --git a/libraries/liblber/dtest.c b/libraries/liblber/dtest.c index e602315634..8ca5b33f0e 100644 --- a/libraries/liblber/dtest.c +++ b/libraries/liblber/dtest.c @@ -18,8 +18,8 @@ #include "portable.h" #include -#include +#include #include #include #include diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c index 434eedc3e5..eaa6832de1 100644 --- a/libraries/liblber/encode.c +++ b/libraries/liblber/encode.c @@ -18,7 +18,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/liblber/etest.c b/libraries/liblber/etest.c index c0b2f40ce1..2feb90777c 100644 --- a/libraries/liblber/etest.c +++ b/libraries/liblber/etest.c @@ -11,7 +11,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/liblber/idtest.c b/libraries/liblber/idtest.c index cc747152c3..7f6723c1c2 100644 --- a/libraries/liblber/idtest.c +++ b/libraries/liblber/idtest.c @@ -18,7 +18,8 @@ #include "portable.h" #include -#include + +#include #ifdef HAVE_PSAP_H #include diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c index b57714765f..1efa4eb5ab 100644 --- a/libraries/liblber/io.c +++ b/libraries/liblber/io.c @@ -18,7 +18,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c index f4f4b490c6..0fd7a5c66a 100644 --- a/libraries/liblber/memory.c +++ b/libraries/liblber/memory.c @@ -4,7 +4,7 @@ */ #include "portable.h" -#include +#include #include #include "lber-int.h" diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c index a323bbee96..c021a79031 100644 --- a/libraries/liblber/options.c +++ b/libraries/liblber/options.c @@ -4,7 +4,7 @@ */ #include "portable.h" -#include +#include #include #include "lber-int.h" diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c index 19b92bf47f..5241833c46 100644 --- a/libraries/liblber/sockbuf.c +++ b/libraries/liblber/sockbuf.c @@ -7,7 +7,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c index 125e4bdee6..6923133bde 100644 --- a/libraries/libldap/abandon.c +++ b/libraries/libldap/abandon.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/addentry.c b/libraries/libldap/addentry.c index 883e05550d..31d85ab5fe 100644 --- a/libraries/libldap/addentry.c +++ b/libraries/libldap/addentry.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/apitest.c b/libraries/libldap/apitest.c index cbab301c27..f3a181aed8 100644 --- a/libraries/libldap/apitest.c +++ b/libraries/libldap/apitest.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include "lber.h" #include "ldap.h" diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c index 336c229f0f..8fe3b358b3 100644 --- a/libraries/libldap/bind.c +++ b/libraries/libldap/bind.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/cache.c b/libraries/libldap/cache.c index d70ebd306e..4a0984b18f 100644 --- a/libraries/libldap/cache.c +++ b/libraries/libldap/cache.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/charset.c b/libraries/libldap/charset.c index 2a88da32a8..8144e0335b 100644 --- a/libraries/libldap/charset.c +++ b/libraries/libldap/charset.c @@ -14,7 +14,8 @@ #ifdef STR_TRANSLATION #include -#include + +#include #include #include @@ -147,7 +148,7 @@ ldap_translate_to_t61( LDAP *ld, char **bufp, unsigned long *lenp, #include -#include +#include #include /* Character set used: ISO 8859-1, ISO 8859-2, ISO 8859-3, ... */ diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c index fbc7228169..7d4f34a439 100644 --- a/libraries/libldap/cldap.c +++ b/libraries/libldap/cldap.c @@ -14,7 +14,8 @@ #ifdef LDAP_CONNECTIONLESS #include -#include + +#include #include #include diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c index 9262bcb955..8afc2477e9 100644 --- a/libraries/libldap/controls.c +++ b/libraries/libldap/controls.c @@ -8,7 +8,7 @@ #include "portable.h" -#include +#include #include #include diff --git a/libraries/libldap/disptmpl.c b/libraries/libldap/disptmpl.c index 0fb3e20163..34a18a80bf 100644 --- a/libraries/libldap/disptmpl.c +++ b/libraries/libldap/disptmpl.c @@ -20,7 +20,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/dsparse.c b/libraries/libldap/dsparse.c index 22f6357164..19446e0ee4 100644 --- a/libraries/libldap/dsparse.c +++ b/libraries/libldap/dsparse.c @@ -22,7 +22,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c index 4c282dced0..93e586363d 100644 --- a/libraries/libldap/error.c +++ b/libraries/libldap/error.c @@ -6,7 +6,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c index d9b221cf87..3bfeb89563 100644 --- a/libraries/libldap/extended.c +++ b/libraries/libldap/extended.c @@ -6,7 +6,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c index ba8c70902b..428f11f828 100644 --- a/libraries/libldap/free.c +++ b/libraries/libldap/free.c @@ -13,7 +13,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/friendly.c b/libraries/libldap/friendly.c index db42adee04..8fb2faf408 100644 --- a/libraries/libldap/friendly.c +++ b/libraries/libldap/friendly.c @@ -12,7 +12,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c index 3155b45d3e..5a6d77066e 100644 --- a/libraries/libldap/getattr.c +++ b/libraries/libldap/getattr.c @@ -12,7 +12,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c index f434465058..dfd1c2e28a 100644 --- a/libraries/libldap/getdn.c +++ b/libraries/libldap/getdn.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/getdxbyname.c b/libraries/libldap/getdxbyname.c index 221bd409fb..f35f4b7727 100644 --- a/libraries/libldap/getdxbyname.c +++ b/libraries/libldap/getdxbyname.c @@ -14,7 +14,7 @@ #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS #include -#include +#include #include #include diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c index 90e43fc14c..9e2e49c4db 100644 --- a/libraries/libldap/getentry.c +++ b/libraries/libldap/getentry.c @@ -12,7 +12,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c index a357abf78b..bf75521457 100644 --- a/libraries/libldap/getfilter.c +++ b/libraries/libldap/getfilter.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/getvalues.c b/libraries/libldap/getvalues.c index d886ab0689..2833e18f5d 100644 --- a/libraries/libldap/getvalues.c +++ b/libraries/libldap/getvalues.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index b4f82f95c7..75bc7a5ec1 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -5,7 +5,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c index 826f8701ce..47d49e4298 100644 --- a/libraries/libldap/kbind.c +++ b/libraries/libldap/kbind.c @@ -14,7 +14,7 @@ #ifdef HAVE_KERBEROS #include -#include +#include #include #include diff --git a/libraries/libldap/messages.c b/libraries/libldap/messages.c index bdab05ff63..eea7bed70c 100644 --- a/libraries/libldap/messages.c +++ b/libraries/libldap/messages.c @@ -9,7 +9,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index 50641603c7..e9a7353ab6 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c index f13656eba0..9985a2bf23 100644 --- a/libraries/libldap/options.c +++ b/libraries/libldap/options.c @@ -6,7 +6,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c index f00b039659..9f7e7051aa 100644 --- a/libraries/libldap/os-ip.c +++ b/libraries/libldap/os-ip.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c index bd2b79c12f..08e96b05b6 100644 --- a/libraries/libldap/references.c +++ b/libraries/libldap/references.c @@ -9,7 +9,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c index 70773082f1..133e42fd10 100644 --- a/libraries/libldap/request.c +++ b/libraries/libldap/request.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index 81c12f80ce..5af8c9243a 100644 --- a/libraries/libldap/result.c +++ b/libraries/libldap/result.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c index af41fc3f66..bce2e845e1 100644 --- a/libraries/libldap/schema.c +++ b/libraries/libldap/schema.c @@ -9,7 +9,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c index a9a5b599a9..61e8c30733 100644 --- a/libraries/libldap/search.c +++ b/libraries/libldap/search.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c index 79f805dfa6..d7ea4e434f 100644 --- a/libraries/libldap/sort.c +++ b/libraries/libldap/sort.c @@ -19,7 +19,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/srchpref.c b/libraries/libldap/srchpref.c index aec72a2f9a..11082dc668 100644 --- a/libraries/libldap/srchpref.c +++ b/libraries/libldap/srchpref.c @@ -20,7 +20,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c index 0e3d14849f..e91aba146f 100644 --- a/libraries/libldap/string.c +++ b/libraries/libldap/string.c @@ -5,7 +5,7 @@ #include "portable.h" -#include +#include #include #include diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c index c36bb26877..4d7234f3c9 100644 --- a/libraries/libldap/test.c +++ b/libraries/libldap/test.c @@ -6,7 +6,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c index ec82cfcba9..72b213947e 100644 --- a/libraries/libldap/tmplout.c +++ b/libraries/libldap/tmplout.c @@ -10,7 +10,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/tmpltest.c b/libraries/libldap/tmpltest.c index 0ddfb49dbc..a12643a152 100644 --- a/libraries/libldap/tmpltest.c +++ b/libraries/libldap/tmpltest.c @@ -5,7 +5,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/ufn.c b/libraries/libldap/ufn.c index 5a6b070291..45386a1d62 100644 --- a/libraries/libldap/ufn.c +++ b/libraries/libldap/ufn.c @@ -12,11 +12,12 @@ #include "portable.h" #include -#include -#include -#include +#include + +#include #include +#include #include #include "ldap-int.h" diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c index ad611fa205..676d599385 100644 --- a/libraries/libldap/unbind.c +++ b/libraries/libldap/unbind.c @@ -12,7 +12,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c index 27a58b3ea8..7ede89a768 100644 --- a/libraries/libldap/url.c +++ b/libraries/libldap/url.c @@ -24,7 +24,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c index cfac8e336f..c5d17fc4dd 100644 --- a/libraries/libldap/util-int.c +++ b/libraries/libldap/util-int.c @@ -22,7 +22,7 @@ #include "portable.h" -#include +#include #include #include diff --git a/libraries/libldap_r/rdwr.c b/libraries/libldap_r/rdwr.c index 60e2a420b6..74cf915197 100644 --- a/libraries/libldap_r/rdwr.c +++ b/libraries/libldap_r/rdwr.c @@ -17,7 +17,7 @@ #include "portable.h" -#include +#include #include #include diff --git a/libraries/libldap_r/thr_sleep.c b/libraries/libldap_r/thr_sleep.c index aa38ebd1a5..1408acb8a1 100644 --- a/libraries/libldap_r/thr_sleep.c +++ b/libraries/libldap_r/thr_sleep.c @@ -30,7 +30,7 @@ #if !defined( HAVE_LWP ) #include -#include +#include #include /* get sleep() */ #include "ldap_pvt_thread.h" diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c index c399558428..9e0b394e6a 100644 --- a/libraries/libldbm/ldbm.c +++ b/libraries/libldbm/ldbm.c @@ -12,7 +12,8 @@ #ifdef SLAPD_LDBM #include -#include + +#include #include #include @@ -552,8 +553,8 @@ ldbm_errno( LDBM ldbm ) /* MMAPED DBM HASHING DATABASE */ -#include -#include +#include +#include /* #define MDBM_DEBUG */ diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c index b4e4abbd07..527bd4f9d9 100644 --- a/libraries/libldif/line64.c +++ b/libraries/libldif/line64.c @@ -3,8 +3,9 @@ #include "portable.h" #include -#include -#include + +#include +#include #include #include diff --git a/libraries/liblutil/base64.c b/libraries/liblutil/base64.c index 96a6b28422..0029dd16d4 100644 --- a/libraries/liblutil/base64.c +++ b/libraries/liblutil/base64.c @@ -46,10 +46,8 @@ #include "portable.h" -#include -#include -#include - +#include +#include #include /* include socket.h to get sys/types.h and/or winsock2.h */ diff --git a/libraries/liblutil/getpass.c b/libraries/liblutil/getpass.c index ceb2ab99d0..eddcd4eaf5 100644 --- a/libraries/liblutil/getpass.c +++ b/libraries/liblutil/getpass.c @@ -15,7 +15,8 @@ #ifndef HAVE_GETPASS #include -#include + +#include #include #include diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c index 6dc49b572c..99c5cfdc64 100644 --- a/libraries/liblutil/passwd.c +++ b/libraries/liblutil/passwd.c @@ -10,7 +10,7 @@ #include "portable.h" -#include +#include #include #include diff --git a/libraries/liblutil/setproctitle.c b/libraries/liblutil/setproctitle.c index 4c13eb95d1..6578a80895 100644 --- a/libraries/liblutil/setproctitle.c +++ b/libraries/liblutil/setproctitle.c @@ -3,7 +3,8 @@ #ifndef HAVE_SETPROCTITLE #include -#include + +#include #include #include diff --git a/libraries/liblutil/sha1.c b/libraries/liblutil/sha1.c index d68d0ce959..3c356afc00 100644 --- a/libraries/liblutil/sha1.c +++ b/libraries/liblutil/sha1.c @@ -200,7 +200,7 @@ static char rcsid[] = "$OpenBSD: sha1hl.c,v 1.1 1997/07/12 20:06:03 millert Exp #endif /* LIBC_SCCS and not lint */ #include -#include +#include #include #include diff --git a/libraries/liblutil/tempnam.c b/libraries/liblutil/tempnam.c index 358d4bddbc..61d9435322 100644 --- a/libraries/liblutil/tempnam.c +++ b/libraries/liblutil/tempnam.c @@ -3,7 +3,8 @@ #ifndef HAVE_TEMPNAM #include -#include + +#include #include #include diff --git a/servers/slapd/back-bdb2/alias.c b/servers/slapd/back-bdb2/alias.c index 5b3588f7ee..beb1fb9dc6 100644 --- a/servers/slapd/back-bdb2/alias.c +++ b/servers/slapd/back-bdb2/alias.c @@ -13,8 +13,8 @@ #include "portable.h" #include -#include -#include /* Get struct sockaddr for slap.h */ +#include +#include #include "slap.h" #include "back-bdb2.h" #include "proto-back-bdb2.h" diff --git a/servers/slapd/back-bdb2/txn.h b/servers/slapd/back-bdb2/txn.h index 1068f238e9..a074e35b2d 100644 --- a/servers/slapd/back-bdb2/txn.h +++ b/servers/slapd/back-bdb2/txn.h @@ -7,8 +7,8 @@ #include #include -#include +#include #include #include #include diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c index 9c4f1adeac..93efcf6ca4 100644 --- a/servers/slapd/back-ldbm/alias.c +++ b/servers/slapd/back-ldbm/alias.c @@ -13,8 +13,8 @@ #include "portable.h" #include -#include -#include /* Get struct sockaddr for slap.h */ +#include +#include #include "slap.h" #include "back-ldbm.h" #include "proto-back-ldbm.h" diff --git a/servers/slapd/back-shell/abandon.c b/servers/slapd/back-shell/abandon.c index 8bfb3c9a41..e1ea263873 100644 --- a/servers/slapd/back-shell/abandon.c +++ b/servers/slapd/back-shell/abandon.c @@ -3,8 +3,8 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c index 2c7f850520..b445796970 100644 --- a/servers/slapd/ch_malloc.c +++ b/servers/slapd/ch_malloc.c @@ -3,7 +3,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 72c5b2627a..e4422cab09 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -249,7 +249,7 @@ void schema_info LDAP_P((Connection *conn, Operation *op, char **attrs, int attr void parse_oc_old LDAP_P(( Backend *be, char *fname, int lineno, int argc, char **argv )); void parse_oc LDAP_P(( char *fname, int lineno, char * line )); void parse_at LDAP_P(( char *fname, int lineno, char *line )); - +char *scherr2str LDAP_P((int code)); /* * str2filter.c */ diff --git a/servers/slapd/shell-backends/passwd-shell.c b/servers/slapd/shell-backends/passwd-shell.c index 89d2fd73d6..0a8d19fdbe 100644 --- a/servers/slapd/shell-backends/passwd-shell.c +++ b/servers/slapd/shell-backends/passwd-shell.c @@ -16,7 +16,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/shell-backends/shellutil.c b/servers/slapd/shell-backends/shellutil.c index 82529aef45..5c9e2a267c 100644 --- a/servers/slapd/shell-backends/shellutil.c +++ b/servers/slapd/shell-backends/shellutil.c @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 57a955b49d..0d6b75a818 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -3,12 +3,12 @@ #ifndef _SLDAPD_H_ #define _SLDAPD_H_ -#include +#include #include #include #include -#include /* needed by LDAP_CONNECTIONLESS */ +#include #include #include "avl.h" diff --git a/servers/slapd/suffixalias.c b/servers/slapd/suffixalias.c index d06d21e4f1..8751d83773 100644 --- a/servers/slapd/suffixalias.c +++ b/servers/slapd/suffixalias.c @@ -19,8 +19,8 @@ #include "portable.h" #include -#include -#include /* Get struct sockaddr for slap.h */ +#include +#include #include "slap.h" /* diff --git a/servers/slapd/tools/centipede.c b/servers/slapd/tools/centipede.c index 536417b43f..c558b1c487 100644 --- a/servers/slapd/tools/centipede.c +++ b/servers/slapd/tools/centipede.c @@ -3,7 +3,7 @@ #include "portable.h" #include -#include +#include #include #include diff --git a/servers/slapd/tools/chlog2replog.c b/servers/slapd/tools/chlog2replog.c index 92dd2a302f..58ae5aa6e5 100644 --- a/servers/slapd/tools/chlog2replog.c +++ b/servers/slapd/tools/chlog2replog.c @@ -19,7 +19,7 @@ #include "portable.h" #include -#include +#include #include #include @@ -413,7 +413,7 @@ print_as(Attr_Sequence as, int modtype, FILE *ofp) } if ( obuf != NULL ) { fputs( obuf, ofp ); - free( obuf ); + ber_memfree( obuf ); } } if ( modtype != 0 ) { diff --git a/servers/slapd/tools/edb2ldif.c b/servers/slapd/tools/edb2ldif.c index 351bfe5ed8..2f9989bcd3 100644 --- a/servers/slapd/tools/edb2ldif.c +++ b/servers/slapd/tools/edb2ldif.c @@ -13,7 +13,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/tools/ldapsyntax.c b/servers/slapd/tools/ldapsyntax.c index 4ce580697d..99fca405be 100644 --- a/servers/slapd/tools/ldapsyntax.c +++ b/servers/slapd/tools/ldapsyntax.c @@ -123,7 +123,7 @@ av2ldif( FILE *outfp, AV_Sequence av, DN dn, short syntax, char *attrname, if ( fputs( buf, outfp ) == EOF ) { rc = -1; } - free( buf ); + ber_memfree( buf ); } } diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c index 5f24ac54c5..0e7cf5e64c 100644 --- a/servers/slapd/tools/ldbmtest.c +++ b/servers/slapd/tools/ldbmtest.c @@ -1,9 +1,9 @@ #include "portable.h" #include -#include #include +#include #include #include #include diff --git a/servers/slapd/tools/ldif.c b/servers/slapd/tools/ldif.c index c2cf5d049c..269a9b4d8a 100644 --- a/servers/slapd/tools/ldif.c +++ b/servers/slapd/tools/ldif.c @@ -1,11 +1,12 @@ #include "portable.h" #include -#include + +#include #include #include -#include /* Get read() */ +#include #ifdef HAVE_IO_H #include @@ -76,7 +77,7 @@ main( int argc, char **argv ) } fputs( out, stdout ); - free( out ); + ber_memfree( out ); free( val ); exit( 0 ); } @@ -91,7 +92,7 @@ main( int argc, char **argv ) exit( 1 ); } fputs( out, stdout ); - free( out ); + ber_memfree( out ); } exit( 0 ); diff --git a/servers/slapd/tools/ldif2id2children-bdb2.c b/servers/slapd/tools/ldif2id2children-bdb2.c index 5b85054461..cb015136f4 100644 --- a/servers/slapd/tools/ldif2id2children-bdb2.c +++ b/servers/slapd/tools/ldif2id2children-bdb2.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c index 8564b86777..a622d0ff93 100644 --- a/servers/slapd/tools/ldif2id2children.c +++ b/servers/slapd/tools/ldif2id2children.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/tools/ldif2id2entry-bdb2.c b/servers/slapd/tools/ldif2id2entry-bdb2.c index b3769b3d4e..18c6357fb3 100644 --- a/servers/slapd/tools/ldif2id2entry-bdb2.c +++ b/servers/slapd/tools/ldif2id2entry-bdb2.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c index 9ed951bc47..832c9818ce 100644 --- a/servers/slapd/tools/ldif2id2entry.c +++ b/servers/slapd/tools/ldif2id2entry.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/tools/ldif2index-bdb2.c b/servers/slapd/tools/ldif2index-bdb2.c index 298906f193..e3930b30fe 100644 --- a/servers/slapd/tools/ldif2index-bdb2.c +++ b/servers/slapd/tools/ldif2index-bdb2.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/tools/ldif2index.c b/servers/slapd/tools/ldif2index.c index 60688763be..4c620e2120 100644 --- a/servers/slapd/tools/ldif2index.c +++ b/servers/slapd/tools/ldif2index.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/tools/sizecount.c b/servers/slapd/tools/sizecount.c index fa1765da80..4d881faf64 100644 --- a/servers/slapd/tools/sizecount.c +++ b/servers/slapd/tools/sizecount.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/servers/slapd/user.c b/servers/slapd/user.c index e92598d800..e32a61ad3f 100644 --- a/servers/slapd/user.c +++ b/servers/slapd/user.c @@ -14,7 +14,8 @@ #if defined(HAVE_SETUID) && defined(HAVE_SETGID) #include -#include + +#include #ifdef HAVE_PWD_H #include diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c index b1417323e3..8927be57ef 100644 --- a/servers/slurpd/args.c +++ b/servers/slurpd/args.c @@ -17,8 +17,8 @@ #include "portable.h" #include -#include +#include #include #include #include diff --git a/servers/slurpd/ch_malloc.c b/servers/slurpd/ch_malloc.c index d6ad464e41..191a7d06c4 100644 --- a/servers/slurpd/ch_malloc.c +++ b/servers/slurpd/ch_malloc.c @@ -17,8 +17,8 @@ #include "portable.h" #include -#include +#include #include #include "../slapd/slap.h" diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c index 247910bfcc..e9b5d7e7c1 100644 --- a/servers/slurpd/config.c +++ b/servers/slurpd/config.c @@ -18,8 +18,8 @@ #include "portable.h" #include -#include +#include #include #include #include diff --git a/servers/slurpd/fm.c b/servers/slurpd/fm.c index 0cb813caca..d8d1dddb3d 100644 --- a/servers/slurpd/fm.c +++ b/servers/slurpd/fm.c @@ -17,8 +17,8 @@ #include "portable.h" #include -#include /* get free() */ +#include #include #include diff --git a/servers/slurpd/globals.c b/servers/slurpd/globals.c index 34593f6585..b90a4570d4 100644 --- a/servers/slurpd/globals.c +++ b/servers/slurpd/globals.c @@ -17,7 +17,8 @@ #include "portable.h" #include -#include + +#include #include #include "slurp.h" diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c index 855eca296b..9ae70dc78d 100644 --- a/servers/slurpd/ldap_op.c +++ b/servers/slurpd/ldap_op.c @@ -17,13 +17,14 @@ #include "portable.h" #include -#include + +#include #include #include #include #include -#include /* Get_t getpid() */ +#include #include diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c index d58b58cb65..911cb61661 100644 --- a/servers/slurpd/re.c +++ b/servers/slurpd/re.c @@ -574,7 +574,7 @@ Re_write( free( obuf ); goto bad; } else { - free( obuf ); + ber_memfree( obuf ); } } } diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c index 2a6166ea9b..6432f59f9c 100644 --- a/servers/slurpd/ri.c +++ b/servers/slurpd/ri.c @@ -20,7 +20,8 @@ #include "portable.h" #include -#include + +#include #include #include "slurp.h" diff --git a/servers/slurpd/rq.c b/servers/slurpd/rq.c index 46667210b6..4ef66727bd 100644 --- a/servers/slurpd/rq.c +++ b/servers/slurpd/rq.c @@ -34,7 +34,8 @@ #include "portable.h" #include -#include + +#include #include /* get ftruncate() */ #include "slurp.h" diff --git a/servers/slurpd/st.c b/servers/slurpd/st.c index fed678b88d..c92de4f78e 100644 --- a/servers/slurpd/st.c +++ b/servers/slurpd/st.c @@ -19,7 +19,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c index 37175de4e3..7f4a403c7e 100644 --- a/tests/progs/slapd-addel.c +++ b/tests/progs/slapd-addel.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c index 1a9356ce49..287a4973ea 100644 --- a/tests/progs/slapd-read.c +++ b/tests/progs/slapd-read.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c index 6eb1ad98f9..1799f639be 100644 --- a/tests/progs/slapd-search.c +++ b/tests/progs/slapd-search.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c index b80fc4e909..a05fa34164 100644 --- a/tests/progs/slapd-tester.c +++ b/tests/progs/slapd-tester.c @@ -1,7 +1,8 @@ #include "portable.h" #include -#include + +#include #include #include -- 2.39.5