integrated patch from Soren Spies <sspies@apple.com> to fix disconnect on afp_createid()

diff --git a/ChangeLog b/ChangeLog
index 6c9c0c6d595758bdfc6acfb52658be16bd8e21f6..aed65befcb6940a751519fac0b69a3f2ac505521 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 
+2001-04-03  jeff b  <jeff@univrel.pr.uconn.edu>  
+
+       * etc/afpd/file.c: merged patch from Soren Spies <sspies@apple.com>
+       at Apple, fixing server disconnect problem upon afp_createid() call
+
 2001-04-02  jeff b  <jeff@univrel.pr.uconn.edu>  
 
        * contrib/shell_utils/Makefile.am, contrib/shell_utils/cleanappledouble.pl:

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 2333f6ccb40b05f90d3ff787456fa17e73f6f641..817c6c93e4cec41238a3f8b10271d11e5afba061 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,4 +1,6 @@
 /*
+ * $Id: file.c,v 1.19 2001-04-03 13:20:44 rufustfirefly Exp $
+ *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -1309,7 +1311,7 @@ int afp_createid(obj, ibuf, ibuflen, rbuf, rbuflen )
       id = 0;
     else {
       memcpy(&id, ad_entry(&ad, ADEID_DID), sizeof(id));
-      ad_close(upath, ADFLAGS_HF);
+      ad_close(&ad, ADFLAGS_HF);
     }
 
     if (id = cnid_add(vol->v_db, &st, did, upath, len, id)) {