[Fedora-directory-commits] ldapserver/ldap/servers/slapd sasl_io.c, 1.6.2.1, 1.6.2.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24375

Modified Files:
      Tag: Directory71RtmBranch
	sasl_io.c 
Log Message:
Resolves: #208058
Summary: "decoding error" when using GSSAPI and adding new entries.
Description: applied the patch to Directory71RtmBranch



Index: sasl_io.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- sasl_io.c	9 Jan 2008 19:37:04 -0000	1.6.2.1
+++ sasl_io.c	9 Jan 2008 21:47:53 -0000	1.6.2.2
@@ -316,7 +316,8 @@
         if (bytes_to_return > count) {
             bytes_to_return = count;
         }
-        memcpy(buffer, sp->decrypted_buffer, bytes_to_return);
+        /* Copy data from the decrypted buffer starting at the offset */
+        memcpy(buffer, sp->decrypted_buffer + sp->decrypted_buffer_offset, bytes_to_return);
         if (bytes_in_buffer == bytes_to_return) {
             sp->decrypted_buffer_offset = 0;
             sp->decrypted_buffer_count = 0;