X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=93d1db8b088b3780601d5251b63fb30d71a0e28e;hb=6d89ace041388b1770167eb473ac539ae74f37db;hp=06f6e4bbb156d8e021d775ecdf6a234bd23663ce;hpb=a27561934c35e2ced470a4832e5f9cca5dee4585;p=deb_libnfs.git

diff --git a/lib/init.c b/lib/init.c
index 06f6e4b..93d1db8 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 <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"
-#else
+#endif
+
+#define _GNU_SOURCE
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
-#endif/*WIN32*/
-#define _GNU_SOURCE
+#endif
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -44,26 +57,32 @@ struct rpc_context *rpc_init_context(void)
 	memset(rpc, 0, sizeof(struct rpc_context));
 
 	rpc->magic = RPC_CONTEXT_MAGIC;
-	rpc->encodebuflen = 65536;
+
+	/* Allow 1M of data (for writes) and some */
+	rpc->encodebuflen = 1024 * 1024 + 4096;
 	rpc->encodebuf = malloc(rpc->encodebuflen);
 	if (rpc->encodebuf == NULL) {
 		free(rpc);
 		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;
+	rpc->tcp_syncnt = RPC_PARAM_UNDEFINED;
+#ifdef WIN32
+	rpc->uid = 65534;
+	rpc->gid = 65534;
+#else
+	rpc->uid = getuid();
+	rpc->gid = getgid();
+#endif
 
 	return rpc;
 }
@@ -91,6 +110,24 @@ void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
 	rpc->auth = auth;
 }
 
+static void rpc_set_uid_gid(struct rpc_context *rpc, int uid, int gid) {
+	if (uid != rpc->uid || gid != rpc->gid) {
+		struct AUTH *auth = libnfs_authunix_create("libnfs", uid, gid, 0, NULL);
+		if (auth != NULL) {
+			rpc_set_auth(rpc, auth);
+			rpc->uid = uid;
+			rpc->gid = gid;
+		}
+	}
+}
+
+void rpc_set_uid(struct rpc_context *rpc, int uid) {
+	rpc_set_uid_gid(rpc, uid, rpc->gid);
+}
+
+void rpc_set_gid(struct rpc_context *rpc, int gid) {
+	rpc_set_uid_gid(rpc, rpc->uid, gid);
+}
 
 void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 {
@@ -198,11 +235,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) {