lots of cleanup; few improvements; fix RDN selection bug when creating connection...

[openldap] / servers / slurpd / slurp.h

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 34fe83a06291a038d5aaeb71e30b16c793c35396..96ca977127e7dcd867a58ea21a9a212d1bed2488 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-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.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -14,6 +22,10 @@
  * 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).
+ */
 
 /* slurp.h - Standalone Ldap Update Replication Daemon (slurpd) */
 
@@ -65,9 +77,6 @@
 /* slurpd dump file - contents of rq struct are written here (debugging) */
 #define        SLURPD_DUMPFILE                 LDAP_TMPDIR LDAP_DIRSEP "slurpd.dump"
 
-/* default srvtab file.  Can be overridden */
-#define        SRVTAB                          "/etc/srvtab"
-
 /* Amount of time to sleep if no more work to do */
 #define        DEFAULT_NO_WORK_INTERVAL        3
 
@@ -85,11 +94,6 @@
 #define TLS_ON                 1
 #define TLS_CRITICAL   2
 
-/* We support simple (plaintext password) and SASL authentication */
-#define        AUTH_SIMPLE     1
-#define        AUTH_KERBEROS   2
-#define        AUTH_SASL 3
-
 /* Rejection records are prefaced with this string */
 #define        ERROR_STR       "ERROR"