repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libnfs.pc.in: fix pkg-config --cflags
[deb_libnfs.git]
/
lib
/
init.c
diff --git
a/lib/init.c
b/lib/init.c
index ecfdcf58ad9d0c8551ec13eb1c1d8586383f81e0..2a451a16d51f4282b76b40f0d32ee416aae72ef0 100644
(file)
--- a/
lib/init.c
+++ b/
lib/init.c
@@
-11,15
+11,27
@@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
#ifdef WIN32
#include "win32_compat.h"
#ifdef WIN32
#include "win32_compat.h"
-#define close closesocket
-#else
+#endif
+
+#define _GNU_SOURCE
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <unistd.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
#include <strings.h>
#include <strings.h>
-#endif/*WIN32*/
-#define _GNU_SOURCE
+#endif
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
@@
-33,10
+45,6
@@
#include "libnfs-raw.h"
#include "libnfs-private.h"
#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;
struct rpc_context *rpc_init_context(void)
{
struct rpc_context *rpc;
@@
-56,17
+64,13
@@
struct rpc_context *rpc_init_context(void)
return NULL;
}
return NULL;
}
-#if defined(WIN32)
- rpc->auth = authunix_create("LibNFS", 65535, 65535, 0, NULL);
-#else
rpc->auth = authunix_create_default();
rpc->auth = authunix_create_default();
-#endif
if (rpc->auth == NULL) {
free(rpc->encodebuf);
free(rpc);
return NULL;
}
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;
salt += 0x01000000;
rpc->fd = -1;