Attachment 190111 Details for Bug 244475 – diffs

[patch] diffs

cvsdiffs (text/plain), 2.81 KB, created by Rich Megginson on 2007-09-07 16:07:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-09-07 16:07:05 UTC

Size: 2.81 KB

patch

obsolete

>Index: ldapserver/ldap/servers/slapd/conntable.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/conntable.c,v
>retrieving revision 1.7
>diff -u -8 -r1.7 conntable.c
>--- ldapserver/ldap/servers/slapd/conntable.c	10 Nov 2006 23:45:40 -0000	1.7
>+++ ldapserver/ldap/servers/slapd/conntable.c	7 Sep 2007 16:02:06 -0000
>@@ -57,17 +57,17 @@
> 	ct->fd = (struct POLL_STRUCT *)slapi_ch_calloc(1, table_size * sizeof(struct POLL_STRUCT));
> 	ct->table_mutex = PR_NewLock();
> 
> 	/* We rely on the fact that we called calloc, which zeros the block, so we don't
> 	 * init any structure element unless a zero value is troublesome later 
> 	 */
> 	for ( i = 0; i < table_size; i++ )
> 	{
>-		int	invalid_socket;
>+		LBER_SOCKET invalid_socket;
> 		ber_len_t maxbersize = config_get_maxbersize();
> 		/* DBDB---move this out of here once everything works */
> 		ct->c[i].c_sb = ber_sockbuf_alloc();
> 		invalid_socket = SLAPD_INVALID_SOCKET;
> 		ber_sockbuf_set_option( ct->c[i].c_sb, LBER_SOCKBUF_OPT_DESC, &invalid_socket );
> 		ct->c[i].c_sd = SLAPD_INVALID_SOCKET;
> 		ber_sockbuf_set_option( ct->c[i].c_sb, LBER_SOCKBUF_OPT_NO_READ_AHEAD, LBER_OPT_ON );
> 		ber_sockbuf_set_option( ct->c[i].c_sb, LBER_SOCKBUF_OPT_MAX_INCOMING_SIZE, &maxbersize );
>Index: ldapserver/ldap/servers/slapd/tools/ldclt/ldapfct.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldapfct.c,v
>retrieving revision 1.4
>diff -u -8 -r1.4 ldapfct.c
>--- ldapserver/ldap/servers/slapd/tools/ldclt/ldapfct.c	5 Jul 2007 23:53:41 -0000	1.4
>+++ ldapserver/ldap/servers/slapd/tools/ldclt/ldapfct.c	7 Sep 2007 16:02:06 -0000
>@@ -581,17 +581,17 @@
> 	RETURN :	-1 if error, 0 else.
> 	DESCRIPTION :
>  *****************************************************************************/
> int
> connectToServer (
> 	thread_context	*tttctx)
> {
>   int	 ret;	/* Return value */
>-  int	 fd;	/* LDAP cnx's fd */
>+  LBER_SOCKET	 fd;	/* LDAP cnx's fd */
>   int	 v2v3;	/* LDAP version used */
> 
>   /*
>    * Maybe close the connection ?
>    * We will do this *here* to keep the cnx the longest time open.
>    */
>   if ((mctx.mode & BIND_EACH_OPER) && (tttctx->ldapCtx != NULL))
>   {
>@@ -618,19 +618,19 @@
>       {
> 	printf ("ldclt[%d]: T%03d: Cannot ldap_get_option(LDAP_OPT_DESC)\n",
> 		mctx.pid, tttctx->thrdNum);
> 	fflush (stdout);
> 	return (-1);
>       }
> #endif
> #ifdef TRACE_FD_GET_OPTION_BUG
>-      printf ("ldclt[%d]: T%03d:  fd=%d\n", mctx.pid, tttctx->thrdNum, fd);
>+      printf ("ldclt[%d]: T%03d:  fd=%d\n", mctx.pid, tttctx->thrdNum, (int)fd);
> #endif
>-      if (close (fd) < 0)
>+      if (close ((int)fd) < 0)
>       {
> 	perror ("ldctx");
> 	printf ("ldclt[%d]: T%03d: cannot close(fd=%d), error=%d (%s)\n",
> 		mctx.pid, tttctx->thrdNum, fd, errno, strerror (errno));
> 	return (-1);
>       }
>     }
>

Actions: View | Diff

Attachments on bug 244475: 190111 | 190391 | 221791 | 222111