Merge branch 'master' into gridftpd

brianhlin · brianhlin · commit 9ba5904fe584 · 2017-08-24T10:22:48.000-05:00
diff --git a/scripts/gridftp-hdfs-standalone.in b/scripts/gridftp-hdfs-standalone.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-. /usr/share/osg/sysconfig/globus-gridftp-server-plugin
+OSG_CONFIG= /usr/share/osg/sysconfig/globus-gridftp-server-plugin
+[ -e $OSG_CONFIG ] && . $OSG_CONFIG
 
 export CLASSPATH=$CLASSPATH
 
diff --git a/scripts/xinetd/gridftp-hdfs-inetd.in b/scripts/xinetd/gridftp-hdfs-inetd.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-. /usr/share/osg/sysconfig/globus-gridftp-server-plugin
+OSG_CONFIG= /usr/share/osg/sysconfig/globus-gridftp-server-plugin
+[ -e $OSG_CONFIG ] && . $OSG_CONFIG
 
 exec /usr/sbin/globus-gridftp-server -c @sysconfdir_resolved@/gridftp-hdfs/gridftp-inetd.conf -dsi hdfs
 
diff --git a/src/gridftp_hdfs.c b/src/gridftp_hdfs.c
@@ -69,7 +69,8 @@ hdfs_destroy(
  */
 static globus_gfs_storage_iface_t       globus_l_gfs_hdfs_dsi_iface = 
 {
-    GLOBUS_GFS_DSI_DESCRIPTOR_BLOCKING | GLOBUS_GFS_DSI_DESCRIPTOR_SENDER,
+    GLOBUS_GFS_DSI_DESCRIPTOR_BLOCKING | GLOBUS_GFS_DSI_DESCRIPTOR_SENDER |
+        GLOBUS_GFS_DSI_DESCRIPTOR_REQUIRES_ORDERED_DATA,
     hdfs_start,
     hdfs_destroy,
     NULL, /* list */
