#endif
#include <sys/types.h>
-#include "lber.h"
-#include "ldap.h"
+#include <ldap.h>
+#undef ldap_debug
#define ldap_debug slurp_debug
#include "ldap_log.h"
#include "ldap_pvt_thread.h"
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
#include "ldif.h"
#define T_DELETECTSTR "delete"
#define T_DELETECT 6
#define T_MODRDNCTSTR "modrdn"
+#define T_MODDNCTSTR "moddn"
+#define T_RENAMECTSTR "rename"
#define T_MODRDNCT 7
#define T_MODOPADDSTR "add"
#define T_MODSEP 11
#define T_NEWRDNSTR "newrdn"
-#define T_DRDNFLAGSTR "deleteoldrdn"
+#define T_DELOLDRDNSTR "deleteoldrdn"
+#define T_NEWSUPSTR "newsuperior"
#define T_ERR -1