add uid and gid URL param to specify alternate uid and/or gid

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index 6085b6892bb9cc068f8611aa90113a5ec1b5f910..df3c2aa2bd90cc25a7302907428c362648f7b85e 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -15,17 +15,24 @@
 #include "config.h"
 #endif
 
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
 #ifdef WIN32
 #include "win32_compat.h"
-#else
-#include <strings.h>
-#endif/*WIN32*/
+#endif
+
 #define _GNU_SOURCE
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -38,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;
@@ -61,19 +64,23 @@ 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;
+       rpc->tcp_syncnt = RPC_PARAM_UNDEFINED;
+#ifdef WIN32
+       rpc->uid = 65534;
+       rpc->gid = 65534;
+#else
+       rpc->uid = getuid();
+       rpc->gid = getgid();
+#endif
 
        return rpc;
 }
@@ -101,6 +108,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, ...)
 {