Fix prev commit, return generated passwd

[openldap] / servers / slapd / back-meta / cache.h

diff --git a/servers/slapd/back-meta/cache.h b/servers/slapd/back-meta/cache.h
index 1f7a50c0834f838fecaa8e0d6e8fc9002492601b..6a7525fc87dca84afab69fe54dc6ebd6c7367c82 100644 (file)
--- a/servers/slapd/back-meta/cache.h
+++ b/servers/slapd/back-meta/cache.h
@@ -1,35 +1,29 @@
-/* Copyright (c) 2003 by International Business Machines, Inc.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute 
-this
- * Software with or without fee, provided that the above copyright notice 
-and
- * all paragraphs of this notice appear in all copies, and that the name 
-of IBM
- * not be used in connection with the marketing of any product 
-incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
+ * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Portions Copyright 2003 IBM Corporation.
+ * All rights reserved.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER 
-ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, 
-EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Apurva Kumar for inclusion
+ * in OpenLDAP Software.
  */
-
 
 #ifndef META_CACHE_H
 #define META_CACHE_H
 #include "slap.h"
 
 /* cache specific errors */
-enum type_of_result 
-{ 
+enum type_of_result { 
     SUCCESS, 
     CONN_ERR, 
     RESULT_ERR,