X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=2a451a16d51f4282b76b40f0d32ee416aae72ef0;hb=b4598f416f1d001d66badd0dc176cfef35b8fedf;hp=80368c2915f99e9f5171d6590fcab66a96144022;hpb=2cdf4fcb07a2d4ec0fbeb66096afd9e8f9cd03a1;p=deb_libnfs.git
diff --git a/lib/init.c b/lib/init.c
index 80368c2..2a451a1 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,14 +11,27 @@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see .
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
#ifdef WIN32
#include "win32_compat.h"
-#else
+#endif
+
+#define _GNU_SOURCE
+
+#ifdef HAVE_UNISTD_H
#include
+#endif
+
+#ifdef HAVE_STRINGS_H
#include
-#endif/*WIN32*/
-#define _GNU_SOURCE
+#endif
#include
#include
@@ -32,10 +45,6 @@
#include "libnfs-raw.h"
#include "libnfs-private.h"
-#ifdef AROS
-#include "aros_compat.h"
-#endif
-
struct rpc_context *rpc_init_context(void)
{
struct rpc_context *rpc;
@@ -55,17 +64,13 @@ struct rpc_context *rpc_init_context(void)
return NULL;
}
-#if defined(WIN32)
- rpc->auth = authunix_create("LibNFS", 65535, 65535, 0, NULL);
-#else
rpc->auth = authunix_create_default();
-#endif
if (rpc->auth == NULL) {
free(rpc->encodebuf);
free(rpc);
return NULL;
}
- rpc->xid = salt + time(NULL);
+ rpc->xid = salt + time(NULL) + getpid() << 16;
salt += 0x01000000;
rpc->fd = -1;
@@ -202,11 +207,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
rpc->auth =NULL;
if (rpc->fd != -1) {
-#if defined(WIN32)
- closesocket(rpc->fd);
-#else
close(rpc->fd);
-#endif
}
if (rpc->encodebuf != NULL) {