Merge remote branch 'sf/product-2-2' into develop

Conflicts:
	etc/afpd/afp_dsi.c
	libatalk/dsi/dsi_stream.c

diff --cc NEWS
Simple merge

diff --cc etc/afpd/afp_dsi.c
index 8b1b1a8d7ce98624b41b0e0ae8edf22eaa195a06,8529177d6cf85588270148e1cca524cbcb64d54a..70caf468694d6318060fb69591acf8e940126b49
--- 1/etc/afpd/afp_dsi.c
--- 2/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@@ -378,23 -383,11 +378,14 @@@ static void pending_request(DSI *dsi
      }
  }
  
- /* -------------------------------------------
-  afp over dsi. this never returns. 
- */
- void afp_over_dsi(AFPObj *obj)
+ void afp_over_dsi_sighandlers(AFPObj *obj)
  {
 -    DSI *dsi = (DSI *) obj->handle;
 +    DSI *dsi = (DSI *) obj->dsi;
 +    int rc_idx;
 +    uint32_t err, cmd;
 +    uint8_t function;
      struct sigaction action;
  
-     AFPobj = obj;
-     obj->exit = afp_dsi_die;
-     obj->reply = (int (*)()) dsi_cmdreply;
-     obj->attention = (int (*)(void *, AFPUserBytes)) dsi_attention;
-     dsi->tickle = 0;
- 
      memset(&action, 0, sizeof(action));
      sigfillset(&action.sa_mask);
      action.sa_flags = SA_RESTART;

diff --cc etc/afpd/auth.c
Simple merge

diff --cc etc/uams/uams_dhx2_pam.c
Simple merge

diff --cc include/atalk/globals.h
index 5d66c33c887bad2708d43cba902d2485a1bdd549,3c458d5d55d8f64b46981e05a445ac8be7d07d6b..b8412d15d7c7b300f8b90b3c94a58ddeb96e374b
--- 1/include/atalk/globals.h
--- 2/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@@ -162,6 -163,9 +162,6 @@@ extern const char *AfpErr2name(int err)
  /* directory.c */
  extern struct dir rootParent;
  
 -#ifndef NO_DDP
 -extern void afp_over_asp (AFPObj *);
 -#endif /* NO_DDP */
  extern void afp_over_dsi (AFPObj *);
- 
+ extern void afp_over_dsi_sighandlers(AFPObj *obj);
  #endif /* globals.h */