From 36a5f1403a91d93db689e989ead3d9cf140c3cde Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Jun 2024 07:34:59 +0200 Subject: Merging upstream version 2.6.8+dfsg. Signed-off-by: Daniel Baumann --- doc/man/man1/Makefile.in | 2 +- doc/man/man1/ldapcompare.1 | 2 +- doc/man/man1/ldapdelete.1 | 2 +- doc/man/man1/ldapmodify.1 | 11 ++++++++++- doc/man/man1/ldapmodrdn.1 | 2 +- doc/man/man1/ldappasswd.1 | 2 +- doc/man/man1/ldapsearch.1 | 2 +- doc/man/man1/ldapurl.1 | 2 +- doc/man/man1/ldapvc.1 | 2 +- doc/man/man1/ldapwhoami.1 | 2 +- 10 files changed, 19 insertions(+), 10 deletions(-) (limited to 'doc/man/man1') diff --git a/doc/man/man1/Makefile.in b/doc/man/man1/Makefile.in index c051765..d9cf31e 100644 --- a/doc/man/man1/Makefile.in +++ b/doc/man/man1/Makefile.in @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2022 The OpenLDAP Foundation. +## Copyright 1998-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/doc/man/man1/ldapcompare.1 b/doc/man/man1/ldapcompare.1 index b15b0c4..5ba6093 100644 --- a/doc/man/man1/ldapcompare.1 +++ b/doc/man/man1/ldapcompare.1 @@ -1,6 +1,6 @@ .TH LDAPCOMPARE 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapcompare \- LDAP compare tool diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1 index e12cc56..2834606 100644 --- a/doc/man/man1/ldapdelete.1 +++ b/doc/man/man1/ldapdelete.1 @@ -1,6 +1,6 @@ .TH LDAPDELETE 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapdelete \- LDAP delete entry tool diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1 index 1104e9f..cf63609 100644 --- a/doc/man/man1/ldapmodify.1 +++ b/doc/man/man1/ldapmodify.1 @@ -1,6 +1,6 @@ .TH LDAPMODIFY 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools @@ -21,6 +21,8 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools [\c .BI \-f \ file\fR] [\c +.BI \-j \ lineno\fR] +[\c .BI \-S \ file\fR] [\c .BR \-M [ M ]] @@ -77,6 +79,8 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools [\c .BI \-f \ file\fR] [\c +.BI \-j \ lineno\fR] +[\c .BI \-S \ file\fR] [\c .BR \-M [ M ]] @@ -171,6 +175,11 @@ reporting an error. Read the entry modification information from \fIfile\fP instead of from standard input. .TP +.BI \-j \ lineno +Jump to the specified line number in the LDIF file before processing any entries. +This allows a load that was aborted due to errors in the input LDIF to be resumed +after the errors are corrected. +.TP .BI \-S \ file Add or change records which were skipped due to an error are written to \fIfile\fP and the error message returned by the server is added as a comment. Most useful in diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1 index 777c539..6db65d3 100644 --- a/doc/man/man1/ldapmodrdn.1 +++ b/doc/man/man1/ldapmodrdn.1 @@ -1,6 +1,6 @@ .TH LDAPMODRDN 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapmodrdn \- LDAP rename entry tool diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1 index d1aea0c..943de89 100644 --- a/doc/man/man1/ldappasswd.1 +++ b/doc/man/man1/ldappasswd.1 @@ -1,6 +1,6 @@ .TH LDAPPASSWD 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldappasswd \- change the password of an LDAP entry diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1 index 7f3ec40..2a57465 100644 --- a/doc/man/man1/ldapsearch.1 +++ b/doc/man/man1/ldapsearch.1 @@ -1,6 +1,6 @@ .TH LDAPSEARCH 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapsearch \- LDAP search tool diff --git a/doc/man/man1/ldapurl.1 b/doc/man/man1/ldapurl.1 index 7e38270..1804d12 100644 --- a/doc/man/man1/ldapurl.1 +++ b/doc/man/man1/ldapurl.1 @@ -1,6 +1,6 @@ .TH LDAPURL 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 2008-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 2008-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapurl \- LDAP URL formatting tool diff --git a/doc/man/man1/ldapvc.1 b/doc/man/man1/ldapvc.1 index 4733080..fef1ddb 100644 --- a/doc/man/man1/ldapvc.1 +++ b/doc/man/man1/ldapvc.1 @@ -1,6 +1,6 @@ .TH LDAPVC 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapvc \- LDAP verify credentials tool diff --git a/doc/man/man1/ldapwhoami.1 b/doc/man/man1/ldapwhoami.1 index 49b1187..0e0d996 100644 --- a/doc/man/man1/ldapwhoami.1 +++ b/doc/man/man1/ldapwhoami.1 @@ -1,6 +1,6 @@ .TH LDAPWHOAMI 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2024 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapwhoami \- LDAP who am i? tool -- cgit v1.2.3