X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=contrib%2Fslapd-modules%2Fnssov%2Fservice.c;h=94aba4044d954a3dc886dd5fc3e6391a606230ff;hb=9d290fe82b20a8f413d7d9ae408a6289d2e0d764;hp=b76ce8fcb6238f87ebe0d3ea8d0e892ab0a25c47;hpb=00ed4a1edde3253b9c635fd6546bf7aeb514d7af;p=openldap

diff --git a/contrib/slapd-modules/nssov/service.c b/contrib/slapd-modules/nssov/service.c
index b76ce8fcb6..94aba4044d 100644
--- a/contrib/slapd-modules/nssov/service.c
+++ b/contrib/slapd-modules/nssov/service.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>. 
  *
- * Copyright 2008-2009 The OpenLDAP Foundation.
+ * Copyright 2008-2013 The OpenLDAP Foundation.
  * Portions Copyright 2008 by Howard Chu, Symas Corp.
  * All rights reserved.
  *
@@ -139,7 +139,7 @@ static int write_service(nssov_service_cbp *cbp,Entry *entry)
 	} else {
 		dupname = -1;
 		for (i=0; i<numname; i++) {
-			if ( ber_bvmatch(&name, &a->a_nvals[i])) {
+			if ( bvmatch(&name, &a->a_nvals[i])) {
 				dupname = i;
 				break;
 			}
@@ -187,7 +187,7 @@ static int write_service(nssov_service_cbp *cbp,Entry *entry)
 	for (i=0;i<numprot;i++)
 	{
 		int j;
-		WRITE_INT32(cbp->fp,NSLCD_RESULT_SUCCESS);
+		WRITE_INT32(cbp->fp,NSLCD_RESULT_BEGIN);
 		WRITE_BERVAL(cbp->fp,&name);
 		if ( dupname >= 0 ) {
 			WRITE_INT32(cbp->fp,numname-1);
@@ -211,13 +211,13 @@ NSSOV_HANDLE(
 	char fbuf[1024];
 	struct berval filter = {sizeof(fbuf)};
 	filter.bv_val = fbuf;
-	READ_STRING_BUF2(fp,cbp.nbuf,sizeof(cbp.nbuf));
+	READ_STRING(fp,cbp.nbuf);
 	cbp.name.bv_len = tmpint32;
 	cbp.name.bv_val = cbp.nbuf;
-	READ_STRING_BUF2(fp,cbp.pbuf,sizeof(cbp.pbuf));
+	READ_STRING(fp,cbp.pbuf);
 	cbp.prot.bv_len = tmpint32;
 	cbp.prot.bv_val = tmpint32 ? cbp.pbuf : NULL;,
-	Debug(LDAP_DEBUG_TRACE,"nssov_service_byname(%s,%s)\n",cbp.name.bv_val,cbp.prot.bv_val,0);,
+	Debug(LDAP_DEBUG_TRACE,"nssov_service_byname(%s,%s)\n",cbp.name.bv_val,cbp.prot.bv_val ? cbp.prot.bv_val : "",0);,
 	NSLCD_ACTION_SERVICE_BYNAME,
 	mkfilter_service_byname(cbp.mi,&cbp.name,&cbp.prot,&filter)
 )
@@ -231,7 +231,7 @@ NSSOV_HANDLE(
 	READ_INT32(fp,number);
 	cbp.name.bv_val = cbp.nbuf;
 	cbp.name.bv_len = snprintf(cbp.nbuf,sizeof(cbp.nbuf),"%d",number);
-	READ_STRING_BUF2(fp,cbp.pbuf,sizeof(cbp.pbuf));
+	READ_STRING(fp,cbp.pbuf);
 	cbp.prot.bv_len = tmpint32;
 	cbp.prot.bv_val = tmpint32 ? cbp.pbuf : NULL;,
 	Debug(LDAP_DEBUG_TRACE,"nssov_service_bynumber(%s,%s)\n",cbp.name.bv_val,cbp.prot.bv_val,0);,