From 27d0e14a120ab4e715ea6dbcd11c185a90b4635f Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 13 Mar 2004 09:13:11 +0000 Subject: [PATCH] Cleanup comments, copyright --- libraries/libldap/ppcontrol.c | 36 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/libraries/libldap/ppcontrol.c b/libraries/libldap/ppcontrol.c index 0cb62a0f25..05d92a4af8 100644 --- a/libraries/libldap/ppcontrol.c +++ b/libraries/libldap/ppcontrol.c @@ -1,23 +1,16 @@ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ -/* Adapted for inclusion into OpenLDAP by Kurt D. Zeilenga */ -/*--- - * Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved. +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 2004 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. * - * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND - * TREATIES. USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT - * TO VERSION 2.0.1 OF THE OPENLDAP PUBLIC LICENSE, A COPY OF WHICH IS - * AVAILABLE AT HTTP://WWW.OPENLDAP.ORG/LICENSE.HTML OR IN THE FILE "LICENSE" - * IN THE TOP-LEVEL DIRECTORY OF THE DISTRIBUTION. ANY USE OR EXPLOITATION - * OF THIS WORK OTHER THAN AS AUTHORIZED IN VERSION 2.0.1 OF THE OPENLDAP - * PUBLIC LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT - * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - *---*/ -/* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License - * can be found in the file "build/LICENSE-2.0.1" in this distribution - * of OpenLDAP Software. + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . */ #include "portable.h" @@ -74,11 +67,6 @@ ldap_create_passwordpolicy_control( LDAP *ld, ber_free(ber, 1); return(ld->ld_errno); - -exit: - ber_free(ber, 1); - ld->ld_errno = LDAP_ENCODING_ERROR; - return(ld->ld_errno); } -- 2.39.5