fix previous commit (ITS#4861)

[openldap] / servers / slapd / shell-backends / shellutil.h

diff --git a/servers/slapd/shell-backends/shellutil.h b/servers/slapd/shell-backends/shellutil.h
index 7f51500d35844ba2b28415dc60502a4d5e8ee05f..08a6c0c8e15ef61c27d873786985406c6e031370 100644 (file)
--- a/servers/slapd/shell-backends/shellutil.h
+++ b/servers/slapd/shell-backends/shellutil.h
@@ -1,16 +1,32 @@
-/*
- shellutil.h
-
- Copyright (c) 1995 Regents of the University of Michigan.
- All rights reserved.
-
- Redistribution and use in source and binary forms are permitted
- provided that this notice is preserved and that due credit is given
- to the University of Michigan at Ann Arbor. The name of the University
- may not be used to endorse or promote products derived from this
- software without specific prior written permission. This software
- is provided ``as is'' without express or implied warranty.
-*/
+/* shellutil.h */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 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.
+ *
+ * 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>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 #ifndef SHELLUTIL_H
 #define SHELLUTIL_H
@@ -55,7 +71,7 @@ struct ldop {
 #define LDOP_SEARCH    0x01
     char       **ldop_suffixes;
     char       *ldop_dn;
-    union {
+    union ldapop_params_u {
                    struct ldsrchparms LDsrchparams;
          }     ldop_params;
 #define ldop_srch      ldop_params.LDsrchparams
@@ -75,9 +91,9 @@ struct ldentry {
 
 
 #ifdef LDAP_DEBUG
-void debug_printf LDAP_P((char *, ...));
+void   debug_printf(const char *, ...) LDAP_GCCATTR((format(printf, 1, 2)));
 #else /* LDAP_DEBUG */
-#define debug_printf()
+#define        debug_printf    (void) /* Ignore "arguments" */
 #endif /* LDAP_DEBUG */
 
 /*