X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Fresult.c;h=571d3c9b8819dae60276a9f07a38d7966257bc1b;hb=42c1ff8a28d35482e9c34d063b4bd5d441bb364a;hp=3d18e23baacde91489e3e86d71a94be2a5bf33c3;hpb=c0f5c884297aac7b930afad98f601912c83e9e72;p=openldap

diff --git a/servers/slapd/back-shell/result.c b/servers/slapd/back-shell/result.c
index 3d18e23baa..571d3c9b88 100644
--- a/servers/slapd/back-shell/result.c
+++ b/servers/slapd/back-shell/result.c
@@ -1,50 +1,90 @@
 /* result.c - shell backend result reading function */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 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).
+ */
 
 #include "portable.h"
 
 #include <stdio.h>
 
+#include <ac/errno.h>
 #include <ac/string.h>
 #include <ac/socket.h>
+#include <ac/unistd.h>
 
 #include "slap.h"
 #include "shell.h"
 
-extern Entry	*str2entry();
-
 int
 read_and_send_results(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    FILE	*fp,
-    char	**attrs,
-    int		attrsonly
-)
+    SlapReply	*rs,
+    FILE	*fp )
 {
 	int	bsize, len;
 	char	*buf, *bp;
 	char	line[BUFSIZ];
-	Entry	*e;
-	int	err;
-	char	*matched, *info;
+	char	ebuf[128];
 
 	/* read in the result and send it along */
 	buf = (char *) ch_malloc( BUFSIZ );
 	buf[0] = '\0';
 	bsize = BUFSIZ;
 	bp = buf;
-	while ( fgets( line, sizeof(line), fp ) != NULL ) {
+	while ( !feof(fp) ) {
+		errno = 0;
+		if ( fgets( line, sizeof(line), fp ) == NULL ) {
+			if ( errno == EINTR ) continue;
+
+			Debug( LDAP_DEBUG_ANY, "shell: fgets failed: %s (%d)\n",
+				AC_STRERROR_R(errno, ebuf, sizeof ebuf), errno, 0 ); 
+			break;
+		}
+
 		Debug( LDAP_DEBUG_SHELL, "shell search reading line (%s)\n",
 		    line, 0, 0 );
+
+		/* ignore lines beginning with # (LDIFv1 comments) */
+		if ( *line == '#' ) {
+			continue;
+		}
+
 		/* ignore lines beginning with DEBUG: */
 		if ( strncasecmp( line, "DEBUG:", 6 ) == 0 ) {
 			continue;
 		}
+
 		len = strlen( line );
-		while ( bp + len - buf > bsize ) {
+		while ( bp + len + 1 - buf > bsize ) {
+			size_t offset = bp - buf;
 			bsize += BUFSIZ;
 			buf = (char *) ch_realloc( buf, bsize );
+			bp = &buf[offset];
 		}
 		strcpy( bp, line );
 		bp += len;
@@ -55,28 +95,30 @@ read_and_send_results(
 				break;
 			}
 
-			if ( (e = str2entry( buf )) == NULL ) {
+			if ( (rs->sr_entry = str2entry( buf )) == NULL ) {
 				Debug( LDAP_DEBUG_ANY, "str2entry(%s) failed\n",
 				    buf, 0, 0 );
 			} else {
-				send_search_entry( be, conn, op, e, attrs,
-				    attrsonly );
-				entry_free( e );
+				rs->sr_attrs = op->oq_search.rs_attrs;
+				rs->sr_flags = REP_ENTRY_MODIFIABLE;
+				send_search_entry( op, rs );
+				entry_free( rs->sr_entry );
+				rs->sr_attrs = NULL;
 			}
 
 			bp = buf;
 		}
 	}
-	(void) str2result( buf, &err, &matched, &info );
+	(void) str2result( buf, &rs->sr_err, (char **)&rs->sr_matched, (char **)&rs->sr_text );
 
 	/* otherwise, front end will send this result */
-	if ( err != 0 || op->o_tag != LDAP_REQ_BIND ) {
-		send_ldap_result( conn, op, err, matched, info );
+	if ( rs->sr_err != 0 || op->o_tag != LDAP_REQ_BIND ) {
+		send_ldap_result( op, rs );
 	}
 
 	free( buf );
 
-	return( err );
+	return( rs->sr_err );
 }
 
 void
@@ -87,7 +129,7 @@ print_suffixes(
 {
 	int	i;
 
-	for ( i = 0; be->be_suffix[i] != NULL; i++ ) {
-		fprintf( fp, "suffix: %s\n", be->be_suffix[i] );
+	for ( i = 0; be->be_suffix[i].bv_val != NULL; i++ ) {
+		fprintf( fp, "suffix: %s\n", be->be_suffix[i].bv_val );
 	}
 }