X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstarttls.c;h=5f985d2007ea566671bbe7566d5bcd0407342ac1;hb=886f60f8223d51e6a3b5fe0bf199e335b6eae86e;hp=225aa60dd43185cf0a2960215bf8cbaa32d6bb33;hpb=10961151ef251aae8fd0e8e304879f260d6b5c79;p=openldap

diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index 225aa60dd4..5f985d2007 100644
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /* 
- * Copyright 1999-2000 The OpenLDAP Foundation.
+ * Copyright 1999-2002 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -30,7 +30,7 @@ starttls_extop (
 	struct berval ** rspdata,
 	LDAPControl ***rspctrls,
 	const char ** text,
-	struct berval *** refs )
+	BerVarray * refs )
 {
 	void *ctx;
 	int rc;
@@ -52,10 +52,10 @@ starttls_extop (
 	}
 
 	/* can't start TLS if there are other op's around */
-	if (( !STAILQ_EMPTY(&conn->c_ops) &&
-			(STAILQ_FIRST(&conn->c_ops) != op ||
-			STAILQ_NEXT(op, o_next) != NULL)) ||
-		( !STAILQ_EMPTY(&conn->c_pending_ops) ))
+	if (( !LDAP_STAILQ_EMPTY(&conn->c_ops) &&
+			(LDAP_STAILQ_FIRST(&conn->c_ops) != op ||
+			LDAP_STAILQ_NEXT(op, o_next) != NULL)) ||
+		( !LDAP_STAILQ_EMPTY(&conn->c_pending_ops) ))
 	{
 		*text = "cannot start TLS when operations are outstanding";
 		rc = LDAP_OPERATIONS_ERROR;