Misc DESC updates

[openldap] / include / srchpref.h

diff --git a/include/srchpref.h b/include/srchpref.h
index 13995d14bbbe2a4946b6c5aa68a67bb1e657efce..f711bb4dc3a0129aff8354f3dbc20815888b462b 100644 (file)
--- a/include/srchpref.h
+++ b/include/srchpref.h
@@ -1,11 +1,13 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * 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 at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 /* Portions
  * Copyright (c) 1993, 1994 Regents of the University of Michigan.
@@ -22,6 +24,7 @@
  * 16 May 1994 by Gordon Good
  */
 
+/* DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED */
 
 #ifndef _SRCHPREF_H
 #define _SRCHPREF_H
@@ -60,8 +63,6 @@ struct ldap_searchobj {
        struct ldap_searchobj           *so_next;
 };
 
-#define NULLSEARCHOBJ                  ((struct ldap_searchobj *)0)
-
 /*
  * global search object options
  */
@@ -85,7 +86,7 @@ ldap_init_searchprefs LDAP_P(( char *file,
 
 LDAP_F( int )
 ldap_init_searchprefs_buf LDAP_P(( char *buf,
-       long buflen,
+       ber_len_t buflen,
        struct ldap_searchobj **solistp ));
 
 LDAP_F( void )